diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 8a892b9b15..5698a696b6 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.2
+ uses: danger/danger-js@11.1.3
with:
args: "--dangerfile tools/danger/dangerfile.js"
env:
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index da70d13a86..1692e2e281 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.2
+ uses: danger/danger-js@11.1.3
with:
args: "--dangerfile tools/danger/dangerfile-lint.js"
env:
diff --git a/CHANGES.md b/CHANGES.md
index 009c2b2af5..d1e4834988 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,59 @@
+Changes in Element v1.5.2 (2022-10-05)
+======================================
+
+Features ✨
+----------
+ - New App Layout is now enabled by default! Go to the Settings > Labs to toggle this ([#7166](https://github.com/vector-im/element-android/issues/7166))
+ - Render inline images in the timeline ([#351](https://github.com/vector-im/element-android/issues/351))
+ - Add privacy setting to disable personalized learning by the keyboard ([#6633](https://github.com/vector-im/element-android/issues/6633))
+
+Bugfixes 🐛
+----------
+ - Disable emoji keyboard not applies in reply ([#5029](https://github.com/vector-im/element-android/issues/5029))
+ - Fix animated images not autoplaying sometimes if only a thumbnail was fetched from the server ([#6215](https://github.com/vector-im/element-android/issues/6215))
+ - Add Warning shield when a user previously verified rotated their cross signing keys ([#6702](https://github.com/vector-im/element-android/issues/6702))
+ - Can't verify user when option to send keys to verified devices only is selected ([#6723](https://github.com/vector-im/element-android/issues/6723))
+ - Add option to only send to verified devices per room (web parity) ([#6725](https://github.com/vector-im/element-android/issues/6725))
+ - Delete pin code key and the key used for biometrics authentication on logout ([#6906](https://github.com/vector-im/element-android/issues/6906))
+ - Fix crash on previewing images to upload on Android Pie. ([#7184](https://github.com/vector-im/element-android/issues/7184))
+ - Fix app restarts in loop on Android 13 on the first run of the app. ([#7224](https://github.com/vector-im/element-android/issues/7224))
+
+In development 🚧
+----------------
+ - [Device Management] Learn more bottom sheets ([#7100](https://github.com/vector-im/element-android/issues/7100))
+ - [Device management] Verify current session ([#7114](https://github.com/vector-im/element-android/issues/7114))
+ - [Device management] Verify another session ([#7143](https://github.com/vector-im/element-android/issues/7143))
+ - [Device management] Rename a session ([#7158](https://github.com/vector-im/element-android/issues/7158))
+ - [Device Manager] Unverified and inactive sessions list ([#7170](https://github.com/vector-im/element-android/issues/7170))
+ - [Device management] Sign out a session ([#7190](https://github.com/vector-im/element-android/issues/7190))
+ - [Device Manager] Parse user agents ([#7247](https://github.com/vector-im/element-android/issues/7247))
+ - [Voice Broadcast] Add a feature flag with the composer action ([#7258](https://github.com/vector-im/element-android/issues/7258))
+
+Improved Documentation 📚
+------------------------
+ - Draft onboarding documentation of the project at `./docs/_developer_onboarding.md` ([#7126](https://github.com/vector-im/element-android/issues/7126))
+
+SDK API changes ⚠️
+------------------
+ - Allow the sync timeout to be configured (mainly useful for testing) ([#7198](https://github.com/vector-im/element-android/issues/7198))
+ - Ports SDK instrumentation tests to use suspending functions instead of countdown latches ([#7207](https://github.com/vector-im/element-android/issues/7207))
+ - [Device Manager] Extend user agent to include device information ([#7209](https://github.com/vector-im/element-android/issues/7209))
+
+Other changes
+-------------
+ - Add support for `/tableflip` command ([#12](https://github.com/vector-im/element-android/issues/12))
+ - Decreases the size of rounded corners and increases the maximum width of message bubbles to help avoid unnecessary unused space on screen ([#5712](https://github.com/vector-im/element-android/issues/5712))
+ - Adds screenshot testing tooling ([#5798](https://github.com/vector-im/element-android/issues/5798))
+ - [AppLayout]: added tracking of new analytics events ([#6508](https://github.com/vector-im/element-android/issues/6508))
+ - Target API 12 and compile with Android SDK 32. ([#6929](https://github.com/vector-im/element-android/issues/6929))
+ - Add basic integration of Sentry to capture errors and crashes if user has given consent. ([#7076](https://github.com/vector-im/element-android/issues/7076))
+ - Add support to `/devtools` command. ([#7126](https://github.com/vector-im/element-android/issues/7126))
+ - Fix lint warning, and cleanup the code ([#7159](https://github.com/vector-im/element-android/issues/7159))
+ - Mutualize the pending auth handling ([#7193](https://github.com/vector-im/element-android/issues/7193))
+ - CI: Prevent modification of translations by developer. ([#7211](https://github.com/vector-im/element-android/issues/7211))
+ - Fix typo in strings.xml and make sure this is American English. ([#7287](https://github.com/vector-im/element-android/issues/7287))
+
+
Changes in Element v1.5.1 (2022-09-28)
======================================
diff --git a/build.gradle b/build.gradle
index e7f7d00159..dd0f9a8d7f 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.2"
- classpath 'org.owasp:dependency-check-gradle:7.2.0'
+ classpath 'org.owasp:dependency-check-gradle:7.2.1'
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'
diff --git a/changelog.d/12.misc b/changelog.d/12.misc
deleted file mode 100644
index 392d7b1122..0000000000
--- a/changelog.d/12.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add support for `/tableflip` command
\ No newline at end of file
diff --git a/changelog.d/5798.misc b/changelog.d/5798.misc
deleted file mode 100644
index 40185eac0d..0000000000
--- a/changelog.d/5798.misc
+++ /dev/null
@@ -1 +0,0 @@
-Adds screenshot testing tooling
diff --git a/changelog.d/6929.misc b/changelog.d/6929.misc
deleted file mode 100644
index d12167cfea..0000000000
--- a/changelog.d/6929.misc
+++ /dev/null
@@ -1 +0,0 @@
-Target API 12 and compile with Android SDK 32.
diff --git a/changelog.d/7114.wip b/changelog.d/7114.wip
deleted file mode 100644
index 79ad705132..0000000000
--- a/changelog.d/7114.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Device management] Verify current session
diff --git a/changelog.d/7126.doc b/changelog.d/7126.doc
deleted file mode 100644
index 9c69350a11..0000000000
--- a/changelog.d/7126.doc
+++ /dev/null
@@ -1 +0,0 @@
-Draft onboarding documentation of the project at `./docs/_developer_onboarding.md`
diff --git a/changelog.d/7126.misc b/changelog.d/7126.misc
deleted file mode 100644
index a79d61f819..0000000000
--- a/changelog.d/7126.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add support to `/devtools` command.
diff --git a/changelog.d/7143.wip b/changelog.d/7143.wip
deleted file mode 100644
index 588f7fb255..0000000000
--- a/changelog.d/7143.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Device management] Verify another session
diff --git a/changelog.d/7158.wip b/changelog.d/7158.wip
deleted file mode 100644
index 6c303281d8..0000000000
--- a/changelog.d/7158.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Device management] Rename a session
diff --git a/changelog.d/7159.misc b/changelog.d/7159.misc
deleted file mode 100644
index 76f5f45c40..0000000000
--- a/changelog.d/7159.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix lint warning, and cleanup the code
diff --git a/changelog.d/7166.misc b/changelog.d/7166.misc
deleted file mode 100644
index d223208853..0000000000
--- a/changelog.d/7166.misc
+++ /dev/null
@@ -1 +0,0 @@
-New App Layout is now enabled by default! Go to the Settings > Labs to toggle this
diff --git a/changelog.d/7170.wip b/changelog.d/7170.wip
deleted file mode 100644
index f5b71a14f8..0000000000
--- a/changelog.d/7170.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Device Manager] Unverified and inactive sessions list
diff --git a/changelog.d/7190.wip b/changelog.d/7190.wip
deleted file mode 100644
index 3c70666d91..0000000000
--- a/changelog.d/7190.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Device management] Sign out a session
diff --git a/changelog.d/7193.misc b/changelog.d/7193.misc
deleted file mode 100644
index efa0f594ae..0000000000
--- a/changelog.d/7193.misc
+++ /dev/null
@@ -1 +0,0 @@
-Mutualize the pending auth handling
diff --git a/changelog.d/7198.sdk b/changelog.d/7198.sdk
deleted file mode 100644
index 115b8d6113..0000000000
--- a/changelog.d/7198.sdk
+++ /dev/null
@@ -1 +0,0 @@
-Allow the sync timeout to be configured (mainly useful for testing)
diff --git a/changelog.d/7207.sdk b/changelog.d/7207.sdk
deleted file mode 100644
index 0bc221e9f7..0000000000
--- a/changelog.d/7207.sdk
+++ /dev/null
@@ -1 +0,0 @@
-Ports SDK instrumentation tests to use suspending functions instead of countdown latches
diff --git a/changelog.d/7209.sdk b/changelog.d/7209.sdk
deleted file mode 100644
index 6375f5e495..0000000000
--- a/changelog.d/7209.sdk
+++ /dev/null
@@ -1 +0,0 @@
-[Device Manager] Extend user agent to include device information
diff --git a/changelog.d/7211.misc b/changelog.d/7211.misc
deleted file mode 100644
index 44abd3d59d..0000000000
--- a/changelog.d/7211.misc
+++ /dev/null
@@ -1 +0,0 @@
- CI: Prevent modification of translations by developer.
diff --git a/dependencies.gradle b/dependencies.gradle
index f4165ad692..3bf3ab746d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -9,9 +9,9 @@ ext.versions = [
def gradle = "7.2.2"
// Ref: https://kotlinlang.org/releases.html
-def kotlin = "1.7.10"
+def kotlin = "1.7.20"
def kotlinCoroutines = "1.6.4"
-def dagger = "2.43.2"
+def dagger = "2.44"
def appDistribution = "16.0.0-beta04"
def retrofit = "2.9.0"
def arrow = "0.8.2"
@@ -22,13 +22,15 @@ def flowBinding = "1.2.0"
def flipper = "0.164.0"
def epoxy = "4.6.2"
def mavericks = "2.7.0"
-def glide = "4.13.2"
+def glide = "4.14.1"
def bigImageViewer = "1.8.1"
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.1"
+
def fragment = "1.5.3"
// Testing
@@ -119,6 +121,7 @@ ext.libs = [
markwon : [
'core' : "io.noties.markwon:core:$markwon",
'extLatex' : "io.noties.markwon:ext-latex:$markwon",
+ 'imageGlide' : "io.noties.markwon:image-glide:$markwon",
'inlineParser' : "io.noties.markwon:inline-parser:$markwon",
'html' : "io.noties.markwon:html:$markwon"
],
@@ -164,10 +167,13 @@ ext.libs = [
apache : [
'commonsImaging' : "org.apache.sanselan:sanselan:0.97-incubator"
],
+ sentry: [
+ 'sentryAndroid' : "io.sentry:sentry-android:$sentry"
+ ],
tests : [
'kluent' : "org.amshove.kluent:kluent-android:1.68",
'timberJunitRule' : "net.lachlanmckee:timber-junit-rule:1.0.1",
- 'junit' : "junit:junit:4.13.2"
+ 'junit' : "junit:junit:4.13.2",
]
]
diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle
index a97d80bc7f..cdab6172d1 100644
--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@@ -148,6 +148,7 @@ ext.groups = [
'io.opencensus',
'io.reactivex.rxjava2',
'io.realm',
+ 'io.sentry',
'it.unimi.dsi',
'jakarta.activation',
'jakarta.xml.bind',
@@ -210,7 +211,6 @@ ext.groups = [
'org.ow2.asm',
'org.ow2.asm',
'org.reactivestreams',
- 'org.robolectric',
'org.slf4j',
'org.sonatype.oss',
'org.testng',
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104360.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104360.txt
new file mode 100644
index 0000000000..fcadf9898c
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Nový vzhled aplikace lze povolit v Experimentálních funkcích. Prosíme, vyzkoušejte ho!
+Oprava problémů s chybějícími oznámeními a dlouhou přírůstkovou synchronizací.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40104360.txt b/fastlane/metadata/android/de-DE/changelogs/40104360.txt
new file mode 100644
index 0000000000..3c47fa7eb6
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Das neue App-Layout kann in den experimentellen Einstellungen aktiviert werden. Probier es gerne aus!
+Fehler bzgl. ausbleibender Benachrichtigungen und langwierigem inkrementellem Synchronisieren behoben.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
index d27bd3ef12..de571645ee 100644
--- a/fastlane/metadata/android/de-DE/short_description.txt
+++ b/fastlane/metadata/android/de-DE/short_description.txt
@@ -1 +1 @@
-Gruppen-Messenger - verschlüsselte Kommunikation, Gruppenchat und Videoanrufe
+Gruppen-Messenger – verschlüsselte Kommunikation, Gruppen und Videoanrufe
diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
index 6304f37925..edee751d06 100644
--- a/fastlane/metadata/android/de-DE/title.txt
+++ b/fastlane/metadata/android/de-DE/title.txt
@@ -1 +1 @@
-Element - Sicherer Messenger
+Element – Sicher kommunizieren
diff --git a/fastlane/metadata/android/en-US/changelogs/40105020.txt b/fastlane/metadata/android/en-US/changelogs/40105020.txt
new file mode 100644
index 0000000000..41795c468c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Main changes in this version: New app layout enabled by default!
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104360.txt b/fastlane/metadata/android/et/changelogs/40104360.txt
new file mode 100644
index 0000000000..1c2733683d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Testide alt saad sisse lülitada uue kujunduse - palun proovi seda!
+Parandasime teavitustega seotud vigu ning andmete sünkroniseerimist pika viitega.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104360.txt b/fastlane/metadata/android/fa/changelogs/40104360.txt
new file mode 100644
index 0000000000..be14e1b9e2
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+چینش کارهٔ جدید میتواند در تنظیمات آزمایشگاهها به کار بیفتند. لطفاً بیازماییدش!
+رفع مشکلات مربوط به آگاهی غایب و همگامسازی تجمعّی طولانی.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104360.txt b/fastlane/metadata/android/fr-FR/changelogs/40104360.txt
new file mode 100644
index 0000000000..80f59952d1
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+La nouvelle présentation de l’application est disponibles dans les paramètres expérimentaux. Essayez-là !
+Correction de problèmes sur les notifications manquantes, et la synchronisation incrémentale lente.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104360.txt b/fastlane/metadata/android/hu-HU/changelogs/40104360.txt
new file mode 100644
index 0000000000..a63a8d1a83
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Az új alkalmazás megjelenés a Laborokban bekapcsolható. Próbáld ki!
+Hiányzó értesítések és hosszú inkrementális szinkronizáció javítása.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104360.txt b/fastlane/metadata/android/id/changelogs/40104360.txt
new file mode 100644
index 0000000000..be626f6350
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Tata Letak Aplikasi Baru dapat diaktifkan di pengaturan Uji Coba. Cobalah!
+Perbariki masalah tentang notifikasi hilang, dan penyinkronan inkremental panjang.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104360.txt b/fastlane/metadata/android/it-IT/changelogs/40104360.txt
new file mode 100644
index 0000000000..c6749d3ff7
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Nuova disposizione dell'app attivabile nelle impostazioni Laboratori. Provala!
+Corretti problemi su notifiche mancanti e sincronizzazioni incrementali lunghe.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104360.txt b/fastlane/metadata/android/pt-BR/changelogs/40104360.txt
new file mode 100644
index 0000000000..78a879ccb7
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Novo Layout de App poder ser habilitado nas configurações de Labs. Por favor dê uma chance!
+Consertar problemas sobre notificação faltando, e sinc incremental longo.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104360.txt b/fastlane/metadata/android/sk/changelogs/40104360.txt
new file mode 100644
index 0000000000..af4154b5cf
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Nové usporiadanie aplikácie môžete povoliť v nastaveniach laboratórií. Vyskúšajte to!
+Oprava problémov týkajúcich sa chýbajúcich oznámení a dlhej inkrementálnej synchronizácie.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104360.txt b/fastlane/metadata/android/uk/changelogs/40104360.txt
new file mode 100644
index 0000000000..a2c9bcc4b5
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Новий макет програми можна увімкнути в налаштуваннях лабораторії. Спробуйте!
+Виправлено проблеми з відсутністю сповіщень та тривалою інкрементною синхронізацією.
+Список усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
index c046d8a40a..330ddde4ae 100644
--- a/fastlane/metadata/android/uk/full_description.txt
+++ b/fastlane/metadata/android/uk/full_description.txt
@@ -5,7 +5,7 @@ Element — це і безпечний месенджер, і застосуно
- Повністю зашифровані повідомлення для надання можливості безпечнішого корпоративного спілкування, навіть для віддалених працівників
- Децентралізований чат на основі відкритого коду Matrix
- Безпечний обмін файлами із зашифрованими даними для керування проєктами
-- Відеочати з передачею голосу через IP та показом екрану іншим
+- Відеочати з передачею голосу через IP та показом екрана іншим
- Проста інтеграція з вашими улюбленими інструментами для онлайн-співпраці, інструментами керування проєктами, послугами VoIP та іншими застосунками обміну повідомленнями для команд
Element цілковито відрізняється від інших застосунків обміну повідомленнями та спільної роботи. Він працює на Matrix, відкритій мережі для безпечного обміну повідомленнями та децентралізованого зв'язку. Це дозволяє самостійне розгортання, щоб надати користувачам якнайбільше володіння та контролю над їх даними та повідомленнями.
diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt
index 9b60098c34..03fdb6e34d 100644
--- a/fastlane/metadata/android/zh-CN/full_description.txt
+++ b/fastlane/metadata/android/zh-CN/full_description.txt
@@ -30,7 +30,7 @@ Element 透过不同的方式让你掌控一切：
你可以与 Matrix 网络上的任何人聊天，不论他们是使用 Element、其他 Matrix 应用或其他通讯应用。
<b>超级安全</b>
-真正的端到端加密（仅有那些在对话中的可以解密讯息）以及交叉签章装置验证。
+真正的端到端加密（仅有那些在对话中的人可以解密讯息）以及交叉签章装置验证。
<b>完整的通讯与整合</b>
信息传递、语音与视频通话、文件分享、画面分享与超多的整合、机器人与挂件。建构房间、社群、保持联络并完成工作。
diff --git a/fastlane/metadata/android/zh-CN/short_description.txt b/fastlane/metadata/android/zh-CN/short_description.txt
index e271e7f9a4..8cfea85b90 100644
--- a/fastlane/metadata/android/zh-CN/short_description.txt
+++ b/fastlane/metadata/android/zh-CN/short_description.txt
@@ -1 +1 @@
-群组消息应用-加密的消息传递、群组聊天和视频通话
+群组消息应用——加密的消息传递、群组聊天和视频通话
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104360.txt b/fastlane/metadata/android/zh-TW/changelogs/40104360.txt
new file mode 100644
index 0000000000..be36b60840
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+新的應用程式佈局可在「實驗室」設定中啟用。請試試看！
+修復關於遺失通知的問題，以及增量同步需要長時間的問題。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/gradle.properties b/gradle.properties
index ded5a43e28..2c999af35d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,8 @@ org.gradle.vfs.watch=true
org.gradle.caching=true
# Android Settings
-android.enableJetifier=false
+android.enableJetifier=true
+android.jetifier.ignorelist=android-base-common,common
android.useAndroidX=true
#Project Settings
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
index a3d69ae8cf..705223c55e 100644
--- a/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
+++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
@@ -30,7 +30,15 @@ object ImageUtils {
fun getBitmap(context: Context, uri: Uri): Bitmap? {
return try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
- ImageDecoder.decodeBitmap(ImageDecoder.createSource(context.contentResolver, uri))
+ val source = ImageDecoder.createSource(context.contentResolver, uri)
+ val listener = ImageDecoder.OnHeaderDecodedListener { decoder, _, _ ->
+ if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
+ // Allocating hardware bitmap may cause a crash on framework versions prior to Android Q
+ decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
+ }
+ }
+
+ ImageDecoder.decodeBitmap(source, listener)
} else {
context.contentResolver.openInputStream(uri)?.use { inputStream ->
BitmapFactory.decodeStream(inputStream)
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 863fa13fbb..25c490807e 100644
--- a/library/ui-strings/src/main/res/values-ca/strings.xml
+++ b/library/ui-strings/src/main/res/values-ca/strings.xml
@@ -2674,4 +2674,40 @@
<string name="device_manager_verification_status_detail_other_session_verified">Aquesta sessió està llesta per a missatges segurs.</string>
<string name="device_manager_verification_status_detail_current_session_verified">La teva sessió actual està llesta per a missatges segurs.</string>
<string name="device_manager_verification_status_detail_current_session_unverified">Verifica la teva sessió actual obtenir missatges segurs millorats.</string>
+ <string name="labs_enable_deferred_dm_summary">Crea missatge directe només al primer missatge</string>
+ <string name="labs_enable_deferred_dm_title">Activa missatges directes programats</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Verifica o tanca aquesta sessió per estar més segur.</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">Per estar més segur, tanca qualsevol sessió que no reconeguis o ja no utilitzis.</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">No s\'han trobat sessions inactives.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">No s\'han trobat sessions no verificades.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">No s\'han trobat sessions verificades.</string>
+ <string name="device_manager_session_details_title">Detalls de sessió</string>
+ <string name="device_manager_other_sessions_clear_filter">Esborra filtre</string>
+ <string name="device_manager_session_details_session_last_activity">Última activitat</string>
+ <string name="device_manager_session_details_session_name">Nom de la sessió</string>
+ <string name="device_manager_session_details_description">Informació d\'aplicació, dispositiu i activitat.</string>
+ <string name="device_manager_session_details_device_ip_address">Adreça IP</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="one">Pensa en tancar sessió de les sessions antigues (%1$d dia o més) que ja no utilitzis.</item>
+ <item quantity="other">Pensa en tancar sessió de les sessions antigues (%1$d dies o més) que ja no utilitzis.</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Inactiu</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">No verificat</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Verificat</string>
+ <string name="a11y_device_manager_filter">Filtra</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">Inactiu durant %1$d dia o més</item>
+ <item quantity="other">Inactiu durant %1$d dies o més</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Inactiu</string>
+ <string name="device_manager_filter_option_unverified">No verificat</string>
+ <string name="device_manager_filter_option_verified">Verificat</string>
+ <string name="device_manager_filter_option_all_sessions">Totes les sessions</string>
+ <string name="device_manager_filter_bottom_sheet_title">Filtre</string>
+ <string name="device_manager_session_last_activity">Última activitat %1$s</string>
+ <string name="device_manager_device_title">Dispositiu</string>
+ <string name="device_manager_session_title">Sessió</string>
+ <string name="device_manager_current_session_title">Sessió actual</string>
+ <string name="labs_enable_new_app_layout_summary">Element simplificat amb pestanyes opcionals</string>
+ <string name="labs_enable_new_app_layout_title">Activa la nova visualització</string>
</resources>
\ No newline at end of file
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 79f8311159..1983036271 100644
--- a/library/ui-strings/src/main/res/values-cs/strings.xml
+++ b/library/ui-strings/src/main/res/values-cs/strings.xml
@@ -2720,4 +2720,48 @@
<string name="a11y_collapse_space_children">Sbalit podprostory %s</string>
<string name="a11y_expand_space_children">Rozbalit podprostory %s</string>
<string name="change_space">Změnit prostor</string>
-</resources>
+ <string name="device_manager_session_details_device_ip_address">IP adresa</string>
+ <string name="device_manager_session_details_session_last_activity">Poslední aktivita</string>
+ <string name="device_manager_session_details_session_name">Název relace</string>
+ <string name="device_manager_session_details_description">Informace o aplikacích, zařízeních a aktivitách.</string>
+ <string name="device_manager_session_details_title">Podrobnosti o relaci</string>
+ <string name="device_manager_other_sessions_clear_filter">Vyčistit filtr</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Nebyly nalezeny žádné neaktivní relace.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Nebyly nalezeny žádné neověřené relace.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Nebyly nalezeny žádné ověřené relace.</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="one">Zvažte odhlášení ze starých relací (%1$d den nebo více), které již nepoužíváte.</item>
+ <item quantity="few">Zvažte odhlášení ze starých relací (%1$d dny nebo více), které již nepoužíváte.</item>
+ <item quantity="other">Zvažte odhlášení ze starých relací (%1$d dnů nebo více), které již nepoužíváte.</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Neaktivní</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Ověřte své relace pro vylepšené bezpečné zasílání zpráv nebo se odhlaste z těch, které již nepoznáváte nebo nepoužíváte.</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Neověřeno</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">Pro nejlepší zabezpečení se odhlaste z každé relace, kterou již nepoznáváte nebo nepoužíváte.</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Ověřeno</string>
+ <string name="a11y_device_manager_filter">Filtr</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">Neaktivní po dobu %1$d dne nebo déle</item>
+ <item quantity="few">Neaktivní po dobu %1$d dnů nebo déle</item>
+ <item quantity="other">Neaktivní po dobu %1$d dnů nebo déle</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Neaktivní</string>
+ <string name="device_manager_filter_option_unverified_description">Není připraveno na bezpečné zasílání zpráv</string>
+ <string name="device_manager_filter_option_unverified">Neověřeno</string>
+ <string name="device_manager_filter_option_verified_description">Připraveno na bezpečné zasílání zpráv</string>
+ <string name="device_manager_filter_option_verified">Ověřeno</string>
+ <string name="device_manager_filter_option_all_sessions">Všechny relace</string>
+ <string name="device_manager_filter_bottom_sheet_title">Filtr</string>
+ <string name="device_manager_session_last_activity">Poslední aktivita %1$s</string>
+ <string name="device_manager_device_title">Zařízení</string>
+ <string name="device_manager_session_title">Relace</string>
+ <string name="device_manager_current_session_title">Aktuální relace</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Pro nejlepší zabezpečení a spolehlivost tuto relaci ověřte nebo se z ní odhlaste.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Ověřte svou aktuální relaci pro vylepšené bezpečené zasílání zpráv.</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Tato relace je připravena pro bezpečné zasílání zpráv.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Vaše aktuální relace je připravena pro bezpečné zasílání zpráv.</string>
+ <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>
+</resources>
\ No newline at end of file
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 e01fc898a3..27f46160bc 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -103,7 +103,7 @@
<string name="notice_room_avatar_changed_by_you">Du hast das Bild des Raumes geändert</string>
<string name="notice_room_name_changed_by_you">Du hast den Raumnamen zu %1$s geändert</string>
<string name="notice_placed_video_call_by_you">Du hast einen Videoanruf gestartet.</string>
- <string name="notice_placed_voice_call_by_you">Du hast einen Audioanruf gestartet.</string>
+ <string name="notice_placed_voice_call_by_you">Du hast einen Sprachanruf gestartet.</string>
<string name="notice_answered_call_by_you">Du hast den Anruf angenommen.</string>
<string name="notice_ended_call_by_you">Du hast den Anruf beendet.</string>
<string name="notice_made_future_room_visibility_by_you">Du hast den zukünftigen Nachrichtenverlauf für %1$s sichtbar gemacht</string>
@@ -269,7 +269,7 @@
<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 des Clients 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, 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_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>
@@ -278,7 +278,7 @@
<string name="join_room">Raum betreten</string>
<string name="username">Benutzername</string>
<string name="logout">Abmelden</string>
- <string name="hs_url">Heimserver-Adresse</string>
+ <string name="hs_url">Heim-Server-Adresse</string>
<string name="search">Suchen</string>
<string name="start_voice_call">Sprachanruf starten</string>
<string name="start_video_call">Videoanruf starten</string>
@@ -308,7 +308,7 @@
<string name="call_error_user_not_responding">Die Gegenseite hat den Anruf nicht angenommen.</string>
<string name="permissions_rationale_popup_title">Information</string>
<string name="permissions_rationale_msg_record_audio">${app_name} benötigt die Berechtigung, auf dein Mikrofon zugreifen zu können, um (Sprach-)Anrufe tätigen zu können.</string>
- <string name="permissions_rationale_msg_camera_and_audio">${app_name} benötigt die Berechtigung, auf Kamera und Mikrofon zu zugreifen, um Video-Anrufe durchzuführen.
+ <string name="permissions_rationale_msg_camera_and_audio">${app_name} benötigt die Berechtigung, auf Kamera und Mikrofon zuzugreifen, um Videoanrufe durchzuführen.
\n
\nBitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen.</string>
<string name="yes">Ja</string>
@@ -351,12 +351,12 @@
<string name="settings_display_name">Anzeigename</string>
<string name="settings_add_email_address">E-Mail-Adresse hinzufügen</string>
<string name="settings_add_phone_number">Telefonnummer hinzufügen</string>
- <string name="settings_app_info_link_summary">Appinfo in den Systemeinstellungen öffnen.</string>
- <string name="settings_app_info_link_title">App-Info</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_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">Gruppenchats</string>
+ <string name="settings_messages_in_group_chat">Gruppenunterhaltungen</string>
<string name="settings_invited_to_room">Einladungen</string>
<string name="settings_call_invitations">Anrufe</string>
<string name="settings_messages_sent_by_bot">Nachrichten von Bots</string>
@@ -366,7 +366,7 @@
<string name="settings_version">Version</string>
<string name="settings_olm_version">OLM-Version</string>
<string name="settings_app_term_conditions">Nutzungsbedingungen</string>
- <string name="settings_third_party_notices">Nutzungshinweise von Drittanbietern</string>
+ <string name="settings_third_party_notices">Drittanbieter-Lizenzen</string>
<string name="settings_copyright">Urheberrechtserklärung</string>
<string name="settings_privacy_policy">Datenschutzerklärung</string>
<string name="settings_clear_cache">Cache leeren</string>
@@ -390,8 +390,8 @@
<string name="devices_details_last_seen_format">%1$s @ %2$s</string>
<string name="devices_delete_dialog_title">Authentifizierung</string>
<string name="settings_logged_in">Angemeldet als</string>
- <string name="settings_home_server">Heimserver</string>
- <string name="settings_identity_server">Identitätsserver</string>
+ <string name="settings_home_server">Heim-Server</string>
+ <string name="settings_identity_server">Identitäts-Server</string>
<string name="account_email_validation_message">Bitte prüfe deinen E-Mail-Posteingang und klicke auf den in der E-Mail enthaltenen Link. Klicke anschließend auf Fortsetzen.</string>
<string name="account_email_already_used_error">Diese E-Mail-Adresse wird bereits verwendet.</string>
<string name="account_phone_number_already_used_error">Diese Telefonnummer wird bereits verwendet.</string>
@@ -403,8 +403,8 @@
<string name="settings_unignore_user">Alle Nachrichten von %s anzeigen\?</string>
<string name="settings_select_country">Wähle ein Land</string>
<string name="room_settings_topic">Thema</string>
- <string name="room_settings_room_read_history_rules_pref_title">Lesbarkeit des Chatverlaufs</string>
- <string name="room_settings_room_read_history_rules_pref_dialog_title">Wer kann den Chatverlauf lesen?</string>
+ <string name="room_settings_room_read_history_rules_pref_title">Lesbarkeit des Verlaufs</string>
+ <string name="room_settings_room_read_history_rules_pref_dialog_title">Wer kann den Verlauf lesen\?</string>
<string name="room_settings_read_history_entry_anyone">Alle</string>
<string name="room_settings_read_history_entry_members_only_option_time_shared">Nur Mitglieder</string>
<string name="room_settings_read_history_entry_members_only_invited">Nur Mitglieder (ab Einladung)</string>
@@ -412,8 +412,8 @@
<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>
- <string name="room_settings_labs_pref_title">Experimentelle Einstellungen</string>
- <string name="room_settings_labs_warning_message">Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können. Mit Vorsicht zu verwenden.</string>
+ <string name="room_settings_labs_pref_title">Labor</string>
+ <string name="room_settings_labs_warning_message">Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können. Verwende sie mit Vorsicht.</string>
<string name="room_settings_set_main_address">Als Hauptadresse setzen</string>
<string name="room_settings_unset_main_address">Als Hauptadresse aufheben</string>
<string name="encryption_information_decryption_error">Entschlüsselungsfehler</string>
@@ -447,7 +447,7 @@
<string name="settings_start_on_boot">Starte beim Systemstart</string>
<string name="settings_clear_media_cache">Medien-Cache leeren</string>
<string name="settings_keep_media">Medien behalten</string>
- <string name="settings_always_show_timestamps">Für alle Nachrichten Zeitstempel anzeigen</string>
+ <string name="settings_always_show_timestamps">Zeitstempel für alle Nachrichten</string>
<string name="media_saving_period_3_days">3 Tage</string>
<string name="media_saving_period_1_week">1 Woche</string>
<string name="media_saving_period_1_month">1 Monat</string>
@@ -500,7 +500,7 @@
<string name="start_video_call_prompt_msg">Sicher, dass du einen Videoanruf starten möchtest\?</string>
<string name="room_participants_ban_prompt_msg">Die Verbannung einer Person entfernt sie aus diesem Raum und hindert sie am erneuten Beitritt.</string>
<string name="room_settings_all_messages">Alle Nachrichten</string>
- <string name="settings_inline_url_preview">URL-Vorschau im Chat</string>
+ <string name="settings_inline_url_preview">URL-Vorschau</string>
<string name="settings_vibrate_on_mention">Vibriere beim Erwähnen eines Nutzers</string>
<string name="create">Erstellen</string>
<string name="group_details_home">Startseite</string>
@@ -551,9 +551,9 @@
<string name="dialog_user_consent_content">Um %1$s weiter zu verwenden, musst die Geschäftsbedingungen begutachten und ihnen zustimmen.</string>
<string name="dialog_user_consent_submit">Jetzt prüfen</string>
<string name="deactivate_account_title">Konto deaktivieren</string>
- <string name="deactivate_account_content">Dies wird dein Konto permanent unbenutzbar machen. Du wirst dich nicht anmelden können und keiner wird denselben Nutzernamen erneut registrieren können. Du verlässt automatisch alle Räume, in denen du bist, und deine Kontoangaben werden vom Identitätsserver gelöscht. <b>Diese Aktion ist unumkehrbar</b>.
+ <string name="deactivate_account_content">Dies wird dein Konto permanent unbenutzbar machen. Du wirst dich nicht anmelden können und keiner wird denselben Nutzernamen erneut registrieren können. Du verlässt automatisch alle Räume, in denen du bist, und deine Kontoangaben werden vom Identitäts-Server gelöscht. <b>Diese Aktion ist unumkehrbar</b>.
\n
-\nDie Deaktivierung deines Konto wird standardmäßig <b>keine deiner gesendeten Nachrichten löschen</b>. Wenn du möchtest, dass auch deine Nachrichten gelöscht werden, wähle zusätzlich die Option unten.
+\nDie Deaktivierung deines Kontos wird standardmäßig <b>keine deiner gesendeten Nachrichten löschen</b>. Wenn du möchtest, dass auch deine Nachrichten gelöscht werden, wähle zusätzlich die Option unten.
\n
\nDie Sichtbarkeit deiner Nachrichten ist ähnlich wie bei E-Mails: Wenn deine Nachrichten gelöscht werden, bedeutet dies, dass von dir verschickte Nachrichten nicht mit neuen oder unregistrierten Nutzer geteilt werden. Aber registrierte Nutzer, die bereits Zugang zu diesen Nachrichten haben, behalten weiterhin Zugriff auf ihre Kopie.</string>
<string name="deactivate_account_delete_checkbox">Bitte alle Nachrichten, die ich gesendet habe, löschen, wenn mein Konto deaktiviert wird (Warnung: Unterhaltungen werden für zukünftige Nutzer unvollständig erscheinen)</string>
@@ -605,7 +605,7 @@
<string name="generic_label_and_value">%1$s: %2$s</string>
<string name="x_plus">+%d</string>
<string name="room_participants_action_remove">Aus Unterhaltung entfernen</string>
- <string name="settings_inline_url_preview_summary">Linkvorschau im Chat aktivieren, falls dein Homeserver diese Funktion unterstützt.</string>
+ <string name="settings_inline_url_preview_summary">Link-Vorschau im Chat aktivieren, falls dein Heim-Server diese Funktion unterstützt.</string>
<string name="settings_send_typing_notifs">Schreibbenachrichtigungen senden</string>
<string name="settings_send_typing_notifs_summary">Lasse andere Benutzer wissen, dass du tippst.</string>
<string name="settings_send_markdown">Markdown-Formatierung</string>
@@ -614,7 +614,7 @@
<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>
<string name="settings_password">Passwort</string>
- <string name="settings_labs_native_camera_summary">Starte die System-Kamera anstelle der angepassten Kamera.</string>
+ <string name="settings_labs_native_camera_summary">Starte die Kamera des Systems anstelle der selbstdefinierten.</string>
<string name="command_problem_with_parameters">Das Kommando \"%s\" braucht mehr Parameter oder einige Parameter sind inkorrekt.</string>
<string name="markdown_has_been_enabled">Markdown wurde aktiviert.</string>
<string name="markdown_has_been_disabled">Markdown wurde deaktiviert.</string>
@@ -729,10 +729,10 @@
<string name="keys_backup_setup_step3_generating_key_status">Wiederherstellungsschlüssel aus Passphrase generieren. Dies kann mehrere Sekunden brauchen.</string>
<string name="keys_backup_setup_skip_msg">Du verlierst möglicherweise den Zugang zu deinen Nachrichten, wenn du dich abmeldest oder das Gerät verlierst.</string>
<string name="keys_backup_restore_is_getting_backup_version">Rufe Backup-Version ab…</string>
- <string name="keys_backup_restore_with_passphrase">Nutze deine Wiederherstellungspassphrase, um deinen verschlüsselten Chatverlauf lesen zu können</string>
+ <string name="keys_backup_restore_with_passphrase">Nutze deine Wiederherstellungs-Passphrase, um deinen verschlüsselten Nachrichtenverlauf lesen zu können</string>
<string name="keys_backup_restore_use_recovery_key">nutze deinen Wiederherstellungsschlüssel</string>
<string name="keys_backup_restore_with_passphrase_helper_with_link">Wenn du deine Wiederherstellungspassphrase nicht weist, kannst du %s.</string>
- <string name="keys_backup_restore_with_recovery_key">Nutze deinen Wiederherstellungsschlüssel, um deinen verschlüsselten Chatverlauf lesen zu können</string>
+ <string name="keys_backup_restore_with_recovery_key">Nutze deinen Wiederherstellungsschlüssel, um deinen verschlüsselten Nachrichtenverlauf lesen zu können</string>
<string name="keys_backup_restore_with_key_helper">Hast du deinen Wiederherstellungsschlüssel verloren\? Du kannst einen neuen in den Einstellungen einrichten.</string>
<string name="keys_backup_passphrase_error_decrypt">Sicherung konnte mit dieser Passphrase nicht entschlüsselt werden. Bitte stelle sicher, dass du die korrekte Wiederherstellungspassphrase eingegeben hast.</string>
<string name="keys_backup_recovery_code_empty_error_message">Gib deinen Wiederherstellungsschlüssel ein</string>
@@ -757,7 +757,7 @@
<string name="keys_backup_settings_invalid_signature_from_verified_device">Die Sicherung hat eine ungültige Signatur von der verifizierten Sitzung %s</string>
<string name="keys_backup_settings_invalid_signature_from_unverified_device">Die Sicherung hat eine ungültige Signatur von der nicht verifizierten Sitzung %s</string>
<string name="keys_backup_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 Chatverlauf zu lesen.</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_backup_not_active">Schlüsselsicherung sollte bei allen Sitzungen aktiviert sein, um den Verlust verschlüsselter Nachrichten zu verhindern.</string>
@@ -889,7 +889,7 @@
<string name="settings_other_third_party_notices">Sonstige Hinweise Dritter</string>
<string name="navigate_to_room_when_already_in_the_room">Du siehst diesen Raum bereits!</string>
<string name="settings_general_title">Allgemein</string>
- <string name="settings_preferences">Einstellungen</string>
+ <string name="settings_preferences">Optionen</string>
<string name="settings_security_and_privacy">Sicherheit und Privatsphäre</string>
<string name="settings_push_rules">Push-Regeln</string>
<string name="settings_push_rules_no_rules">Keine Push-Regeln definiert</string>
@@ -934,7 +934,7 @@
<string name="settings_background_fdroid_sync_mode_disabled">Keine Hintergrundsynchronisation</string>
<string name="settings_discovery_category">Auffindbarkeit</string>
<string name="widget_integration_review_terms">Um fortzufahren, musst du die Nutzungsbedingungen akzeptieren.</string>
- <string name="identity_server_not_defined">Du verwendest keinen Identitätsserver</string>
+ <string name="identity_server_not_defined">Du verwendest keinen Identitäts-Server</string>
<string name="error_user_already_logged_in">Du versuchst anscheinend, eine Verbindung zu einem anderen Homeserver herzustellen. Möchtest du dich abmelden\?</string>
<string name="push_gateway_item_push_key">Push-Key:</string>
<string name="push_gateway_item_app_display_name">App-Anzeigename:</string>
@@ -942,13 +942,13 @@
<string name="terms_of_service">Nutzungsbedingungen</string>
<string name="terms_description_for_identity_server">Für andere auffindbar sein</string>
<string name="terms_description_for_integration_manager">Verwende Bots, Bridges, Widgets und Sticker-Pakete</string>
- <string name="identity_server">Identitätsserver</string>
- <string name="disconnect_identity_server">Verbindung zum Identitätsserver trennen</string>
- <string name="add_identity_server">Identitätsserver konfigurieren</string>
- <string name="change_identity_server">Identitätsserver ändern</string>
+ <string name="identity_server">Identitäts-Server</string>
+ <string name="disconnect_identity_server">Verbindung zum Identitäts-Server trennen</string>
+ <string name="add_identity_server">Identitäts-Server konfigurieren</string>
+ <string name="change_identity_server">Identitäts-Server ändern</string>
<string name="settings_discovery_emails_title">Auffindbare E-Mail-Adressen</string>
<string name="settings_discovery_no_mails">Erkennungsoptionen werden angezeigt, sobald du eine E-Mail hinzugefügt hast.</string>
- <string name="settings_discovery_enter_identity_server">Gib einen neuen Identitätsserver ein</string>
+ <string name="settings_discovery_enter_identity_server">Gib eine Identitäts-Server-Adresse ein</string>
<string name="settings_discovery_bad_identity_server">Konnte keine Verbindung zum Homeserver herstellen</string>
<string name="login_error_no_homeserver_found">Dies ist keine Adresse eines Matrixservers</string>
<string name="login_error_homeserver_not_found">Kann Homeserver nicht unter dieser URL erreichen. Bitte überprüfen</string>
@@ -986,15 +986,15 @@
<string name="push_gateway_item_device_name">Sitzungsname:</string>
<string name="push_gateway_item_format">Format:</string>
<string name="settings_discovery_identity_server_info">Du nutzt aktuell %1$s um vorhandene Kontakte zu finden und um von dir bekannten Kontakten gefunden zu werden.</string>
- <string name="settings_discovery_identity_server_info_none">Du benutzt aktuell keinen Identitätsserver. Um zu entdecken und um von dir bekannten Kontakten entdeckt zu werden, richte unten einen ein.</string>
+ <string name="settings_discovery_identity_server_info_none">Aktuell nutzt du keinen Identitäts-Server. Richte einen ein, um andere zu finden und selbst auffindbar zu sein.</string>
<string name="settings_discovery_msisdn_title">Auffindbare Telefonnummern</string>
- <string name="settings_discovery_please_enter_server">Bitte gib die Adresse des Identitätsservers ein</string>
- <string name="settings_discovery_no_terms_title">Identitätsserver hat keine Nutzungsbedingungen</string>
- <string name="settings_discovery_no_terms">Der Identitätsserver den du ausgewählt hast, hat keine Nutzungsbedingungen. Fahre nur fort, wenn du dem Besitzer des Dienstes vertraust</string>
+ <string name="settings_discovery_please_enter_server">Bitte gib die Adresse des Identitäts-Servers ein</string>
+ <string name="settings_discovery_no_terms_title">Identitäts-Server hat keine Nutzungsbedingungen</string>
+ <string name="settings_discovery_no_terms">Der Identitäts-Server, den du ausgewählt hast, hat keine Nutzungsbedingungen. Fahre nur fort, wenn du den Betreibenden des Dienstes vertraust</string>
<string name="settings_text_message_sent">Eine Textnachricht wurde an %s gesendet. Bitte gib den Verifizierungscode ein, den sie enthält.</string>
<string name="labs_allow_extended_logging">Aktiviere ausführliche Logs.</string>
- <string name="labs_allow_extended_logging_summary">Ausführliche Logs werden der Entwicklung der App dadurch helfen, dass mehr Informationen übertragen werden, wenn du einen Fehlerbericht sendest. Auch wenn dies aktiviert ist, werden keine Nachrichteninhalte oder andere privaten Daten aufgezeichnet.</string>
- <string name="error_terms_not_accepted">Bitte erneut versuchen, nachdem du die Nutzungsbedingungen deines Heimservers akzeptiert hast.</string>
+ <string name="labs_allow_extended_logging_summary">Ausführliche Protokolle werden bei der Entwicklung der App helfen. Auch wenn dies aktiviert ist, werden keine Nachrichteninhalte oder andere privaten Daten aufgezeichnet.</string>
+ <string name="error_terms_not_accepted">Bitte erneut versuchen, nachdem du die Nutzungsbedingungen deines Heim-Servers akzeptiert hast.</string>
<string name="room_widget_permission_webview_shared_info_title">Bei Benutzung könnten Cookies gesetzt werden und es könnten Daten mit %s geteilt werden:</string>
<string name="room_widget_permission_shared_info_title">Bei Benutzung könnten Daten mit %s geteilt werden:</string>
<string name="settings_discovery_no_msisdn">Optionen zum Finden werden erscheinen, sobald du eine Telefonnummer hinzugefügt hast.</string>
@@ -1004,7 +1004,7 @@
<string name="a11y_open_drawer">Navigationsmenü öffnen</string>
<string name="a11y_create_menu_open">Raumerstellungsmenü öffnen</string>
<string name="a11y_create_menu_close">Schließe das Raumerstellungsmenü…</string>
- <string name="a11y_create_direct_message">Starte einen neuen Privatchat</string>
+ <string name="a11y_create_direct_message">Erstelle eine neue Direktnachricht</string>
<string name="a11y_create_room">Erstelle einen neuen Raum</string>
<string name="a11y_close_keys_backup_banner">Schließe Key-Backup-Einblendung</string>
<string name="a11y_jump_to_bottom">Zum Ende springen</string>
@@ -1052,7 +1052,7 @@
<string name="help_long_click_on_room_for_more_options">Halte auf einem Raum um mehr Optionen anzuzeigen</string>
<string name="room_join_rules_public">%1$s hat den Raum für jeden, der den Link hat, öffentlich gemacht.</string>
<string name="timeline_unread_messages">Ungelesene Nachrichten</string>
- <string name="login_splash_text1">Privat oder in Gruppen mit Leuten chatten</string>
+ <string name="login_splash_text1">Schreibe privat oder in Gruppen</string>
<string name="login_splash_text2">Halte Gespräche mittels Verschlüsselung privat</string>
<string name="login_splash_submit">Los geht\'s</string>
<string name="login_server_title">Wähle einen Server</string>
@@ -1063,9 +1063,9 @@
<string name="login_server_other_title">Andere</string>
<string name="login_server_other_text">Benutzerdefinierte und erweiterte Einstellungen</string>
<string name="login_continue">Fortfahren</string>
- <string name="settings_discovery_disconnect_identity_server_info">Eine Trennung von deinem Identitätsserver würde bedeuten, dass du weder von anderen Nutzern gefunden werden, noch diese per E-Mail oder Telefonnummer einladen kannst.</string>
- <string name="settings_discovery_disconnect_with_bound_pid">Du teilst deine E-Mail-Adressen oder Telefonnummern momentan auf dem Identitätsserver %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.</string>
- <string name="settings_agree_to_terms">Stimme den Nutzungsbedingungen des Identitätsservers (%s) zu, um zu erlauben per E-Mail oder Telefonnummer gefunden zu werden.</string>
+ <string name="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="login_splash_text3">Erweitere und individualisiere dein Benutzererlebnis</string>
<string name="login_connect_to">Mit %1$s verbinden</string>
@@ -1081,13 +1081,13 @@
<string name="login_registration_disabled">Es tut uns leid. Dieser Server akzeptiert keine neuen Benutzerkonten.</string>
<string name="login_registration_not_supported">Die Anwendung kann kein neues Benutzerkonto auf diesem Server erstellen.
\n
-\nMöchtest du dich über eine Web-Anwendung anmelden\?</string>
+\nMöchtest du dich mit einer Web-Anwendung anmelden\?</string>
<string name="login_login_with_email_error">Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft.</string>
<string name="login_reset_password_on">Passwort auf %1$s zurücksetzen</string>
<string name="login_reset_password_email_hint">E-Mail</string>
<string name="login_reset_password_password_hint">Neues Passwort</string>
<string name="login_reset_password_warning_title">Achtung!</string>
- <string name="login_reset_password_warning_content">Eine Änderung deines Passworts wird alle Ende-zu-Ende-Schlüssel zurücksetzen. Dein verschlüsselter Chatverlauf wird dadurch unlesbar. Richte die Schlüsselsicherung ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzt.</string>
+ <string name="login_reset_password_warning_content">Eine Änderung deines Passworts wird alle Ende-zu-Ende-Schlüssel zurücksetzen. Dein verschlüsselter Verlauf wird dadurch unlesbar. Richte die Schlüsselsicherung ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzt.</string>
<string name="login_reset_password_warning_submit">Fortfahren</string>
<string name="login_reset_password_error_not_found">Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft</string>
<string name="login_reset_password_mail_confirmation_title">Prüfe deinen Posteingang</string>
@@ -1126,9 +1126,9 @@
<string name="login_splash_title">Es ist deine Konversation. Mache sie dir zu eigen.</string>
<string name="login_server_url_form_modular_text">Premium-Hosting für Organisationen</string>
<string name="login_server_url_form_modular_notice">Gib die Adresse des Modular Element oder Servers ein, den du verwenden möchtest</string>
- <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Homeserver anmelden. Der Homeserver unterstützt die folgenden Anmeldemöglichkeiten: %1$s.
+ <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Heim-Server anmelden. Der Heim-Server unterstützt die folgenden Anmeldemöglichkeiten: %1$s.
\n
-\nMöchtest du dich mit einem Webclient anmelden\?</string>
+\nMöchtest du dich mit einer Web-Anwendung anmelden\?</string>
<string name="login_reset_password_notice">Dir wird eine Bestätigungsmail gesendet, um dein neues Passwort zu bestätigen.</string>
<string name="login_reset_password_submit">Weiter</string>
<string name="login_reset_password_success_notice_2">Du wurdest von allen Sitzungen abgemeldet und erhältst keine Push-Benachrichtigungen mehr. Um Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.</string>
@@ -1272,21 +1272,21 @@
<string name="verification_code_notice">Vergleiche den Code mit dem Code auf dem Bildschirm deines Gegenübers.</string>
<string name="verification_conclusion_ok_notice">Nachrichten mit diesem Gegenüber sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.</string>
<string name="verification_conclusion_ok_self_notice">Deine neue Sitzung ist jetzt verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an.</string>
- <string name="encryption_information_cross_signing_state">Cross-Signing</string>
- <string name="encryption_information_dg_xsigning_complete">Cross-Signing ist aktiviert
-\nPrivate Schlüssel auf dem Gerät.</string>
- <string name="encryption_information_dg_xsigning_trusted">Cross-Signing ist aktiviert
+ <string name="encryption_information_cross_signing_state">Quersignierung</string>
+ <string name="encryption_information_dg_xsigning_complete">Quersignierung ist aktiviert,
+\nprivate Schlüssel auf dem Gerät.</string>
+ <string name="encryption_information_dg_xsigning_trusted">Quersignierung ist aktiviert,
\nSchlüssel sind vertrauenswürdig.
\nPrivate Schlüssel sind nicht bekannt</string>
- <string name="encryption_information_dg_xsigning_not_trusted">Cross-Signing ist aktiviert
+ <string name="encryption_information_dg_xsigning_not_trusted">Quersignierung ist aktiviert,
\nSchlüssel sind nicht vertrauenswürdig</string>
- <string name="encryption_information_dg_xsigning_disabled">Cross-Signing ist nicht aktiviert</string>
+ <string name="encryption_information_dg_xsigning_disabled">Quersignierung ist nicht aktiviert</string>
<string name="settings_active_sessions_list">Aktive Sitzungen</string>
<string name="settings_active_sessions_show_all">Alle Sitzungen anzeigen</string>
<string name="settings_active_sessions_manage">Sitzungen verwalten</string>
<string name="settings_active_sessions_signout_device">Diese Sitzung abmelden</string>
<string name="settings_failed_to_get_crypto_device_info">Keine kryptografischen Informationen verfügbar</string>
- <string name="settings_active_sessions_verified_device_desc">Diese Sitzung ist für sichere Nachrichtenübertragung vertrauenswürdig, da du sie überprüft hast:</string>
+ <string name="settings_active_sessions_verified_device_desc">Diese Sitzung ist für sichere Kommunikation vertrauenswürdig, da du sie überprüft hast:</string>
<string name="settings_active_sessions_unverified_device_desc">Verifiziere diese Sitzung, um sie als vertrauenswürdig zu markieren, und gewähren ihr Zugriff auf verschlüsselte Nachrichten. Wenn du dich nicht bei dieser Sitzung angemeldet hast, ist dein Konto möglicherweise gefährdet:</string>
<plurals name="settings_active_sessions_count">
<item quantity="one">Eine aktive Sitzung</item>
@@ -1301,10 +1301,10 @@
<string name="room_member_profile_sessions_section_title">Sitzungen</string>
<string name="trusted">Vertraut</string>
<string name="not_trusted">Nicht vertraut</string>
- <string name="verification_profile_device_verified_because">Diese Sitzung ist für sichere Nachrichtenübertragung vertrauenswürdig, weil %1$s (%2$s) sie verifiziert hat:</string>
+ <string name="verification_profile_device_verified_because">Diese Sitzung ist für sichere Kommunikation vertrauenswürdig, weil %1$s (%2$s) sie verifiziert hat:</string>
<string name="verification_profile_device_new_signing">%1$s (%2$s) hat sich in einer neuen Sitzung angemeldet:</string>
<string name="verification_profile_device_untrust_info">Bis dieser Benutzer dieser Sitzung vertraut, werden an und von ihm gesendete Nachrichten mit Warnungen gekennzeichnet. Alternativ kannst du dies manuell überprüfen.</string>
- <string name="initialize_cross_signing">Initialisiere Cross-Signing</string>
+ <string name="initialize_cross_signing">Quersignierung initialisieren</string>
<string name="reset_cross_signing">Schlüssel zurücksetzen</string>
<string name="a11y_qr_code_for_verification">QR-Code</string>
<string name="qr_code_scanned_by_other_notice">Fast geschafft! Zeigt %s ein Häkchen\?</string>
@@ -1373,7 +1373,7 @@
<string name="error_failed_to_import_keys">Import der Schlüssel fehlgeschlagen</string>
<string name="settings_notification_configuration">Benachrichtigungskonfiguration</string>
<string name="settings_messages_at_room">Nachrichten mit \"@room\"</string>
- <string name="settings_messages_in_e2e_group_chat">Verschlüsselte Gruppenchats</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="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>
@@ -1381,7 +1381,7 @@
<string name="bootstrap_crosssigning_print_it">Druck es aus und speichere es an einem sicheren Ort</string>
<string name="bootstrap_crosssigning_save_cloud">Kopier es in deinen persönlichen Cloud-Speicher</string>
<string name="encryption_not_enabled">Verschlüsselung ist nicht aktiviert</string>
- <string name="settings_when_rooms_are_upgraded">Raumupgrades</string>
+ <string name="settings_when_rooms_are_upgraded">Raumaktualisierung</string>
<string name="encryption_enabled">Verschlüsselung aktiviert</string>
<string name="encryption_enabled_tile_description">Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Erfahre mehr und verifiziere Benutzer in deren Profil.</string>
<string name="encryption_unknown_algorithm_tile_description">Die Verschlüsselung in diesem Raum wird nicht unterstützt</string>
@@ -1392,7 +1392,7 @@
<string name="qr_code_scanned_verif_waiting_notice">Fast geschafft! Warte auf Bestätigung…</string>
<string name="settings_messages_in_e2e_one_to_one">Verschlüsselte Direktnachrichten</string>
<string name="room_message_placeholder">Nachricht…</string>
- <string name="security_prompt_text">Verifiziere dich und andere, um eure Chats zu schützen</string>
+ <string name="security_prompt_text">Verifiziere dich und andere, um eure Unterhaltungen zu schützen</string>
<string name="bootstrap_enter_recovery">Gib zum Fortfahren deinen %s ein</string>
<string name="use_file">Datei benutzen</string>
<string name="bootstrap_invalid_recovery_key">Dies ist kein gültiger Wiederherstellungsschlüssel</string>
@@ -1412,12 +1412,12 @@
<string name="settings_security_prevent_screenshots_title">Bildschirmfotos der Anwendung verhindern</string>
<string name="settings_security_prevent_screenshots_summary">Das Aktivieren dieser Einstellung setzt FLAG_SECURE in allen Aktivitäten. Starte die Anwendung neu, damit die Änderung wirksam wird.</string>
<string name="change_password_summary">Neues Benutzerpasswort festlegen…</string>
- <string name="use_other_session_content_description">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} für Android oder einen anderen cross-signing-fähigen Matrix-Client</string>
+ <string name="use_other_session_content_description">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} für Android oder eine andere Matrix-Anwendung, die Quersignierung unterstützt</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">oder einen anderen cross-signing-fähigen Matrix Client</string>
+ <string name="or_other_mx_capable_client">oder eine andere Matrix-Anwendung, die Quersignierung unterstützt</string>
<string name="use_latest_app">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten:</string>
<string name="command_description_discard_session">Erzwingt das Verwerfen der aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum</string>
<string name="command_description_discard_session_not_handled">Wird nur in verschlüsselten Räumen unterstützt</string>
@@ -1461,7 +1461,7 @@
<string name="action_dismiss">Ablehnen</string>
<string name="dialog_title_success">Erfolg</string>
<string name="call_failed_no_connection_description">Echtzeitverbindung konnte nicht hergestellt werden.
-\nBitte den Administrator deines Heimservers, einen TURN-Server zu konfigurieren, damit Anrufe zuverlässig funktionieren.</string>
+\nBitte den Administrator deines Heim-Servers, einen TURN-Server zu konfigurieren, damit Anrufe zuverlässig funktionieren.</string>
<string name="call_select_sound_device">Audiogerät auswählen</string>
<string name="sound_device_phone">Telefon</string>
<string name="sound_device_speaker">Lautsprecher</string>
@@ -1555,22 +1555,22 @@
<string name="choose_locale_other_locales_title">Andere verfügbare Sprachen</string>
<string name="choose_locale_loading_locales">Lade verfügbare Sprachen…</string>
<string name="open_terms_of">Öffne AGBs von %s</string>
- <string name="disconnect_identity_server_dialog_content">Trenne Verbindung zu Identitätsserver %s\?</string>
- <string name="identity_server_error_outdated_identity_server">Dieser Identitätsserver ist veraltet. ${app_name} unterstützt nur API V2.</string>
+ <string name="disconnect_identity_server_dialog_content">Verbindung zu Identitäts-Server %s trennen\?</string>
+ <string name="identity_server_error_outdated_identity_server">Dieser Identitäts-Server ist veraltet. ${app_name} unterstützt nur API V2.</string>
<string name="identity_server_error_outdated_home_server">Diese Operation ist nicht möglich. Der Homeserver ist veraltet.</string>
- <string name="identity_server_error_no_identity_server_configured">Bitte konfiguriere zuerst einen Identitätsserver.</string>
- <string name="identity_server_error_terms_not_signed">Bitte akzeptiere zuerst die AGB des Identitätsservers in den Einstellungen.</string>
+ <string name="identity_server_error_no_identity_server_configured">Bitte konfiguriere zuerst einen Identitäts-Server.</string>
+ <string name="identity_server_error_terms_not_signed">Bitte akzeptiere zuerst die AGB des Identitäts-Servers in den Einstellungen.</string>
<string name="identity_server_error_bulk_sha256_not_supported">Deiner Privatsphäre wegen unterstützt ${app_name} nur das Senden gehashter E-Mail-Adressen und Telefonnummern.</string>
<string name="identity_server_error_binding_error">Die Assoziierung ist fehlgeschlagen.</string>
<string name="identity_server_error_no_current_binding_error">Für diese Kennung gibt es aktuell keine Zuordnung.</string>
- <string name="identity_server_set_default_notice">Dein Homeserver (%1$s) schlägt %2$s als Identitätsserver vor</string>
+ <string name="identity_server_set_default_notice">Dein Heim-Server (%1$s) schlägt %2$s als Identitäts-Server vor</string>
<string name="identity_server_set_default_submit">Benutze %1$s</string>
- <string name="identity_server_set_alternative_notice">Alternativ kannst du die URL eines beliebigen anderen Identitätsservers angeben</string>
- <string name="identity_server_set_alternative_notice_no_default">Gib die URL von einem Identitätsserver ein</string>
- <string name="identity_server_set_alternative_submit">Bestätigen</string>
- <string name="power_level_edit_title">Lege Rolle fest</string>
+ <string name="identity_server_set_alternative_notice">Alternativ kannst du die URL eines beliebigen anderen Identitäts-Servers angeben</string>
+ <string name="identity_server_set_alternative_notice_no_default">Gib die Adresse eines Identitäts-Servers ein</string>
+ <string name="identity_server_set_alternative_submit">Absenden</string>
+ <string name="power_level_edit_title">Rolle festlegen</string>
<string name="power_level_title">Rolle</string>
- <string name="a11y_open_chat">Öffne Chat</string>
+ <string name="a11y_open_chat">Unterhaltung öffnen</string>
<string name="a11y_mute_microphone">Stelle Mikrophon stumm</string>
<string name="a11y_unmute_microphone">Aktiviere Mikrophon</string>
<string name="a11y_stop_camera">Stoppe Kamera</string>
@@ -1704,7 +1704,7 @@
<string name="bad_passphrase_key_reset_all_action">Alle Wiederherstellungsoptionen vergessen oder verloren\? Alles zurücksetzen</string>
<string name="direct_room_created_summary_item_by_you">Du bist beigetreten.</string>
<string name="direct_room_created_summary_item">%s ist beigetreten.</string>
- <string name="direct_room_encryption_enabled_tile_description">Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt.</string>
+ <string name="direct_room_encryption_enabled_tile_description">Nachrichten in dieser Unterhaltung sind Ende-zu-Ende-verschlüsselt.</string>
<string name="direct_room_profile_section_more_leave">Verlassen</string>
<string name="direct_room_profile_section_more_settings">Einstellungen</string>
<string name="direct_room_profile_encrypted_subtitle">Nachrichten hier sind Ende-zu-Ende-verschlüsselt.
@@ -1744,10 +1744,10 @@
<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="no_more_results">Keine weiteren Ergebnisse</string>
- <string name="start_chatting">Beginne ein Gespräch</string>
+ <string name="start_chatting">Beginne eine Unterhaltung</string>
<string name="settings_discovery_consent_action_give_consent">Autorisieren</string>
<string name="settings_discovery_consent_action_revoke">Meine Zustimmung widerrufen</string>
- <string name="settings_discovery_consent_notice_on">Du hast zugestimmt E-Mails und Telefonnummern an diesen Identitätsserver zu senden, um von anderen Nutzern entdeckt zu werden.</string>
+ <string name="settings_discovery_consent_notice_on">Du hast zugestimmt, E-Mail-Adressen und Telefonnummern an diesen Identitäts-Server zu übermitteln, um für andere auffindbar zu sein.</string>
<string name="settings_discovery_consent_title">E-Mails und Telefonnummern senden</string>
<string name="direct_room_user_list_suggestions_title">Vorschläge</string>
<string name="direct_room_user_list_known_title">Bekannte Personen</string>
@@ -1774,7 +1774,7 @@
<string name="phone_book_perform_lookup">Suche nach Kontakten auf Matrix</string>
<string name="room_settings_set_avatar">Raumbild einrichten</string>
<string name="identity_server_user_consent_not_provided">Einverständnis wurde nicht abgegeben.</string>
- <string name="user_code_info_text">Teile diesen Code mit Leuten, damit sie ihn scannen und mit dir chatten können.</string>
+ <string name="user_code_info_text">Teile diesen Code, damit andere ihn einlesen und mit dir schreiben können.</string>
<string name="user_code_share">Meinen Code teilen</string>
<string name="user_code_my_code">Mein Code</string>
<string name="user_code_scan">Scanne einen QR-Code</string>
@@ -1794,7 +1794,7 @@
<string name="create_room_alias_invalid">Manche Zeichen sind nicht zulässig</string>
<string name="create_room_alias_empty">Bitte gib eine Raumadresse an</string>
<string name="create_room_alias_already_in_use">Diese Adresse ist bereits vergeben</string>
- <string name="create_room_disable_federation_description">Aktivieren, wenn der Raum nur von Mitgliedern deines Heimservers zur internen Kommunikation verwendet wird. Das kann später nicht mehr geändert werden.</string>
+ <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>
@@ -1849,7 +1849,7 @@
<string name="settings_show_emoji_keyboard_summary">Knopf zum Nachrichteneditor hinzufügen, der die Emoji-Tastatur öffnet</string>
<string name="settings_show_emoji_keyboard">Emoji-Tastatur anzeigen</string>
<string name="settings_chat_effects_description">Nutze /confetti oder sende Nachrichten mit ❄️ oder 🎉</string>
- <string name="settings_chat_effects_title">Chateffekte</string>
+ <string name="settings_chat_effects_title">Effekte im Verlauf</string>
<string name="room_permissions_change_topic">Thema ändern</string>
<string name="room_permissions_upgrade_the_room">Raum aktualisieren</string>
<string name="room_permissions_notice">Rollen, die zum Ändern verschiedener Teile des Raums erforderlich sind, auswählen</string>
@@ -1859,7 +1859,7 @@
<string name="authentication_error">Authentifizierung fehlgeschlagen</string>
<string name="re_authentication_default_confirm_text">Deine Anmeldeinformationen müssen für ${app_name} eingegeben werden, um diese Aktion auszuführen.</string>
<string name="re_authentication_activity_title">Erneute Authentifizierung erforderlich</string>
- <string name="failed_to_initialize_cross_signing">Cross-Signing konnte nicht eingerichtet werden</string>
+ <string name="failed_to_initialize_cross_signing">Quersignierung konnte nicht eingerichtet werden</string>
<string name="error_unauthorized">Nicht autorisierte, fehlende gültige Authentifizierungsdaten</string>
<string name="call_transfer_users_tab_title">Nutzer</string>
<string name="call_transfer_failure">Beim Weiterleiten des Anrufs ist ein Fehler aufgetreten</string>
@@ -1917,7 +1917,7 @@
<item quantity="other">%d Einträge</item>
</plurals>
<string name="settings_server_upload_size_unknown">Die Obergrenze ist nicht bekannt.</string>
- <string name="settings_server_upload_size_content">Dein Homeserver akzeptiert Anhänge (wie Dateien, Medien, etc.) mit einer Größe bis zu %s.</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_version">Serverversion</string>
<string name="settings_server_name">Servername</string>
@@ -1960,7 +1960,7 @@
<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="share_space_link_message">Tritt meinem Space %1$s %2$s bei</string>
- <string name="spaces_beta_welcome_to_spaces_desc">Mit Spaces kannst du Personen und Räume gruppieren.</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>
<string name="skip_for_now">Vorübergehend überspringen</string>
<string name="create_spaces_room_public_header">Über welche Themen möchtest du dich in %s unterhalten\?</string>
@@ -1994,8 +1994,8 @@
<string name="your_public_space">Dein öffentlicher Space</string>
<string name="command_description_join_space">Betrete einen Space mit der angegebenen ID</string>
<string name="create_space_topic_hint">Beschreibung</string>
- <string name="create_spaces_loading_message">Erzeuge Space…</string>
- <string name="create_spaces_default_public_random_room_name">Irgendetwas</string>
+ <string name="create_spaces_loading_message">Erzeuge Space …</string>
+ <string name="create_spaces_default_public_random_room_name">Ohne Thema</string>
<string name="create_spaces_default_public_room_name">Allgemein</string>
<string name="activity_create_space_title">Einen Space erstellen</string>
<string name="create_spaces_just_me">Nur für mich</string>
@@ -2051,7 +2051,7 @@
<string name="private_space">Privater Space</string>
<string name="public_space">Öffentlicher Space</string>
<string name="call_transfer_unknown_person">Unbekannte Person</string>
- <string name="give_feedback">Feedback geben</string>
+ <string name="give_feedback">Rückmeldung geben</string>
<string name="feedback_failed">Fehler beim Senden vom Feedback (%s)</string>
<string name="feedback_sent">Dein Feedback wurde erfolgreich versandt. Danke!</string>
<string name="you_may_contact_me">Mich bei Fragen kontaktieren</string>
@@ -2086,7 +2086,7 @@
<string name="a11y_pause_voice_message">Sprachnachricht pausieren</string>
<string name="a11y_play_voice_message">Sprachnachricht abspielen</string>
<string name="a11y_start_voice_message">Sprachnachricht aufnehmen</string>
- <string name="room_using_unstable_room_version">Dieser Raum verwendet die Raumversion %s, die von diesem Heimserver als instabil markiert ist.</string>
+ <string name="room_using_unstable_room_version">Dieser Raum verwendet die Raumversion %s, die von diesem Heim-Server als instabil markiert ist.</string>
<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>
@@ -2105,14 +2105,14 @@
<string name="sent_a_voice_message">Sprachnachricht</string>
<string name="decide_who_can_find_and_join">Lege fest, wer diesen Raum finden und betreten kann.</string>
<string name="tap_to_edit_spaces">Klicke, um die Spaces zu bearbeiten</string>
- <string name="select_spaces">Spaces auswählen</string>
+ <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_messages_by_bot">Nachrichten von Bots</string>
<string name="settings_room_invitations">Raumeinladungen</string>
- <string name="settings_encrypted_group_messages">Verschlüsselten Gruppenchats</string>
- <string name="settings_group_messages">Gruppenchats</string>
+ <string name="settings_encrypted_group_messages">Verschlüsselte Gruppennachrichten</string>
+ <string name="settings_group_messages">Gruppennachrichten</string>
<string name="settings_encrypted_direct_messages">Verschlüsselten Direktnachrichten</string>
<string name="settings_messages_direct_messages">Direktnachrichten</string>
<string name="settings_messages_containing_username">Mein Benutzername</string>
@@ -2129,7 +2129,7 @@
<item quantity="one">Verpasster Sprachanruf</item>
<item quantity="other">%d verpasste Sprachanrufe</item>
</plurals>
- <string name="hs_client_url">Heimserver API URL</string>
+ <string name="hs_client_url">Heim-Server API URL</string>
<string name="denied_permission_voice_message">Um Sprachnachrichten zu senden, erlaube bitte Zugriff aufs Mikrofon.</string>
<string name="denied_permission_camera">Um fortzufahren, erlaube bitte in den Systemeinstellungen Zugriff auf die Kamera.</string>
<string name="denied_permission_generic">Für diese Aktion fehlen einige Berechtigungen, bitte erlaube diese in den Systemeinstellungen.</string>
@@ -2243,8 +2243,8 @@
<string name="open_discovery_settings">Auffindungseinstellungen öffnen</string>
<string name="shortcut_disabled_reason_sign_out">Sitzung abgemeldet!</string>
<string name="shortcut_disabled_reason_room_left">Raum verlassen!</string>
- <string name="login_error_homeserver_from_url_not_found_enter_manual">Heimserver auswählen</string>
- <string name="login_error_homeserver_from_url_not_found">Es konnte kein Heimserver mit der Adresse %s gefunden werden. Bitte überprüfe die Adresse oder wähle den Heimserver manuell.</string>
+ <string name="login_error_homeserver_from_url_not_found_enter_manual">Heim-Server auswählen</string>
+ <string name="login_error_homeserver_from_url_not_found">Es konnte kein Heim-Server mit der Adresse %s gefunden werden. Bitte überprüfe die Adresse oder wähle den Heim-Server manuell.</string>
<string name="space_add_space_to_any_space_you_manage">Untergeordneten Space hinzufügen.</string>
<string name="identity_server_consent_dialog_content_question">Bist du dir wirklich sicher, dass du diese Informationen senden willst\?</string>
<string name="identity_server_consent_dialog_title_2">E-Mail-Adressen und Telefonnummern an %s senden</string>
@@ -2259,16 +2259,16 @@
\n%s kannst du alle unsere Bedingungen lesen.</string>
<string name="create_spaces_invite_public_header_desc">Stelle sicher, dass die richtigen Personen Zugriff auf %s haben. Du kannst jederzeit weitere Personen einladen.</string>
<string name="create_spaces_invite_public_header">Wer ist Mitglied deines Teams\?</string>
- <string name="settings_discovery_no_policy_provided">Der Identitätsserver gibt keine Bedingungen an</string>
- <string name="settings_discovery_hide_identity_server_policy_title">Bedingungen des Identitätsservers ausblenden</string>
- <string name="settings_discovery_show_identity_server_policy_title">Bedingungen des Identitätsservers anzeigen</string>
+ <string name="settings_discovery_no_policy_provided">Der Identitäts-Server gibt keine Bedingungen an</string>
+ <string name="settings_discovery_hide_identity_server_policy_title">Richtlinie des Identitäts-Servers ausblenden</string>
+ <string name="settings_discovery_show_identity_server_policy_title">Bedingungen des Identitäts-Servers anzeigen</string>
<string name="preference_system_settings">Systemeinstellungen</string>
<string name="preference_versions">Versionen</string>
<string name="preference_help_summary">Erhalte Hilfe bei der Bedienung von ${app_name}</string>
<string name="preference_help_title">Hilfe und Unterstützung</string>
<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 beitreten.</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_title">Hilf mit, ${app_name} zu verbessern</string>
<string name="action_enable">Aktivieren</string>
@@ -2296,15 +2296,15 @@
<string name="discovery_section">Auffindbarkeit (%s)</string>
<string name="discovery_invite">Per E-Mail einladen, finde deine Kontakte und mehr…</string>
<string name="finish_setting_up_discovery">Schließe die Konfiguration des Auffindbarkeitsdienstes ab.</string>
- <string name="create_space_identity_server_info_none">Du verwendest derzeit keinen Identitätsserver. Um Teammitglieder einzuladen und für sie auffindbar zu sein, müssen du einen solchen Server konfigurieren.</string>
- <string name="login_splash_already_have_account">Ich habe schon ein Konto</string>
- <string name="ftue_auth_carousel_encrypted_title">Sichere Nachrichtenübertragung.</string>
- <string name="ftue_auth_carousel_secure_title">Besitze deine Konversationen.</string>
- <string name="identity_server_consent_dialog_content_3">Um bestehende Kontakte ermitteln zu können, müsst du Kontaktinformationen (E-Mails und Telefonnummern) an Ihren Identitätsserver senden. Wir verschlüsseln deine Daten vor dem Senden, um den Datenschutz zu gewährleisten.</string>
- <string name="settings_discovery_consent_notice_off_2">Deine Kontakte sind privat. Um in deinen Kontakten Benutzer erkennen zu können, benötigen wir deine Erlaubnis, Kontaktinformationen an deinen Identitätsserver zu senden.</string>
+ <string name="create_space_identity_server_info_none">Du verwendest derzeit keinen Identitäts-Server. Um Team-Mitglieder einzuladen und für sie auffindbar zu sein, konfiguriere zunächst einen.</string>
+ <string name="login_splash_already_have_account">Ich habe bereits ein Konto</string>
+ <string name="ftue_auth_carousel_encrypted_title">Sichere Kommunikation.</string>
+ <string name="ftue_auth_carousel_secure_title">Besitze deine Unterhaltungen.</string>
+ <string name="identity_server_consent_dialog_content_3">Um bestehende Kontakte ermitteln zu können, musst du Kontaktinformationen (E-Mail-Adressen und Telefonnummern) an deinen Identitäts-Server übermitteln. Wir verschlüsseln deine Daten vor der Übermittlung, um den Datenschutz gewährleisten zu können.</string>
+ <string name="settings_discovery_consent_notice_off_2">Deine Kontakte sind privat. Um unter deinen Kontakten Matrix-Nutzer finden zu können, benötigen wir deine Erlaubnis, Kontaktinformationen an deinen Identitäts-Server zu übermitteln.</string>
<string name="legals_no_policy_provided">Dieser Server stellt keine Richtlinie bereit.</string>
- <string name="legals_identity_server_title">Deine Identitätsserver-Richtlinie</string>
- <string name="legals_home_server_title">Deine Heimserver Richtlinie</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="tooltip_attachment_poll">Abstimmung erstellen</string>
<string name="tooltip_attachment_contact">Kontakte öffnen</string>
@@ -2340,10 +2340,10 @@
<string name="edit_poll_title">Umfrage 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">Nachrichtenaustausch für dein Team.</string>
+ <string name="ftue_auth_carousel_workplace_title">Kommunikation für dein Team.</string>
<string name="ftue_auth_carousel_encrypted_body">Ende-zu-Ende-verschlüsselt und ohne Telefonnummer nutzbar. Keine Werbung oder Datenerfassung.</string>
- <string name="ftue_auth_carousel_control_body">Wähle wo deine Gespräche liegen, für Kontrolle und Unabhängigkeit. Verbunden mit Matrix.</string>
- <string name="ftue_auth_carousel_secure_body">Sichere und unabhängige Kommunikation, die für die gleiche Vertraulichkeit sorgt, wie ein Gespräch von Angesicht zu Angesicht in deinem eigenen Zuhause.</string>
+ <string name="ftue_auth_carousel_control_body">Wähle, wo deine Unterhaltungen gespeichert werden, um Kontrolle und Unabhängigkeit zu erhalten. Verbunden via Matrix.</string>
+ <string name="ftue_auth_carousel_secure_body">Sichere und unabhängige Kommunikation, die für eine Vertraulichkeit sorgt, wie ein Gespräch von Angesicht zu Angesicht in deinen eigenen vier Wänden.</string>
<string name="attachment_type_location">Standort</string>
<string name="encryption_misconfigured">Die Verschlüsselung ist fehlerhaft konfiguriert</string>
<string name="contact_admin_to_restore_encryption">Bitte kontaktiere einen Admin, um die Verschlüsselung zurückzusetzen.</string>
@@ -2363,10 +2363,10 @@
<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_title">Mit wem wirst du am meisten chatten\?</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>
- <string name="message_bubbles">Nachrichtenblasen anzeigen</string>
+ <string name="message_bubbles">Nachrichtenblasen</string>
<string name="location_timeline_failed_to_load_map">Laden der Karte fehlgeschlagen</string>
<string name="a11y_static_map_image">Karte</string>
<string name="labs_enable_thread_messages_desc">Hinweis: App wird neugestartet</string>
@@ -2401,7 +2401,7 @@
<string name="location_share_live_stop">Beenden</string>
<string name="location_share_live_enabled">Live-Standort aktiviert</string>
<string name="a11y_location_share_option_pinned_icon">Standort teilen</string>
- <string name="location_share_option_pinned">Standort teilen</string>
+ <string name="location_share_option_pinned">Diesen Standort teilen</string>
<string name="location_share_option_user_current">Meinen Standort teilen</string>
<string name="a11y_location_share_option_user_current_icon">Meinen Standort teilen</string>
<string name="a11y_location_share_option_user_live_icon">Live-Standort teilen</string>
@@ -2409,19 +2409,19 @@
<string name="threads_notice_migration_title">Threads nähern sich der Beta 🎉</string>
<string name="action_disable">Deaktivieren</string>
<string name="beta">BETA</string>
- <string name="give_feedback_threads">Feedback geben</string>
+ <string name="give_feedback_threads">Rückmeldung geben</string>
<string name="beta_title_bottom_sheet_action">BETA</string>
- <string name="threads_labs_enable_notice_title">Threads Beta</string>
+ <string name="threads_labs_enable_notice_title">Threads-Beta</string>
<string name="threads_beta_enable_notice_title">Threads Beta</string>
<string name="call_start_screen_sharing">Bildschirm teilen</string>
- <string name="action_try_it_out">Ausprobieren</string>
+ <string name="action_try_it_out">Probiere es aus</string>
<string name="location_share_live_until">Live bis %1$s</string>
<string name="unifiedpush_getdistributors_dialog_title">Wähle Deine Benachrichtigungsmethode</string>
<string name="labs_enable_live_location_summary">Vorläufige Implementierung: Standorte bleiben im Nachrichtenverlauf von Räumen erhalten</string>
<string name="push_gateway_item_profile_tag">Profil-Tag:</string>
<string name="time_unit_hour_short">h</string>
<string name="live_location_labs_promotion_switch_title">Standortfreigabe aktivieren</string>
- <string name="live_location_labs_promotion_description">Bitte beachten: Dies ist eine Testfunktion mit einer vorübergehenden Implementierung. Das bedeutet, dass Du Deinen Standortverlauf nicht löschen kannst und dass fortgeschrittene Nutzer Deinen Standortverlauf auch dann noch sehen können, wenn Du Deinen Live-Standort nicht mehr mit diesem Raum teilst.</string>
+ <string name="live_location_labs_promotion_description">Bitte beachte: Dies ist eine experimentelle Funktion, die eine temporäre Implementierung nutzt. Das bedeutet, dass du deinen Standortverlauf nicht löschen kannst und erfahrene Nutzer ihn sehen können, selbst wenn du deinen Live-Standort nicht mehr mit diesem Raum teilst.</string>
<string name="live_location_labs_promotion_title">Live-Standortfreigabe</string>
<string name="settings_troubleshoot_test_current_gateway">Aktuelles Gateway: %s</string>
<string name="settings_troubleshoot_test_current_gateway_title">Gateway</string>
@@ -2464,7 +2464,7 @@
<string name="a11y_audio_playback_duration">%1$d Minuten %2$d Sekunden</string>
<string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
<string name="settings_show_latest_profile_description">Die neuesten Profilinformationen (Avatar und Anzeigename) für alle Nachrichten anzeigen.</string>
- <string name="settings_show_latest_profile">Aktuelle Benutzerinformationen anzeigen</string>
+ <string name="settings_show_latest_profile">Aktuelle Profilinformationen</string>
<string name="ftue_personalize_complete_title">Sieht gut aus!</string>
<string name="ftue_display_name_title">einen Anzeigenamen wählen</string>
<string name="ftue_account_created_take_me_home">Zurück zum Home-Screen</string>
@@ -2480,11 +2480,11 @@
<string name="settings_presence">Präsenz</string>
<string name="settings_autoplay_animated_images_summary">Animierte Bilder in der Zeitleiste abspielen, sobald sie sichtbar sind</string>
<string name="settings_autoplay_animated_images_title">Animierte Bilder automatisch abspielen</string>
- <string name="settings_troubleshoot_test_endpoint_registration_failed">Das Endpunkt-Token konnte nicht auf dem Heimserver registriert werden:
+ <string name="settings_troubleshoot_test_endpoint_registration_failed">Das Endpunkt-Token konnte nicht auf dem Heim-Server registriert werden:
\n%1$s</string>
- <string name="settings_troubleshoot_test_endpoint_registration_success">Endpunkt erfolgreich beim Heimserver registriert.</string>
+ <string name="settings_troubleshoot_test_endpoint_registration_success">Endpunkt erfolgreich beim Heim-Server registriert.</string>
<string name="settings_troubleshoot_test_endpoint_registration_title">Endpunkt-Registrierung</string>
- <string name="threads_labs_enable_notice_message">Dein Heimserver unterstützt derzeit keine Threads, daher kann diese Funktion evtl. nicht richtig funktionieren. Einige Nachrichten mit Threads sind möglicherweise nicht zuverlässig verfügbar. %sMöchtest Du Threads trotzdem aktivieren\?</string>
+ <string name="threads_labs_enable_notice_message">Dein Heim-Server unterstützt derzeit keine Threads, daher könnte diese Funktion evtl. nicht richtig funktionieren. Einige Nachrichten mit Threads sind möglicherweise nicht zuverlässig verfügbar. %sMöchtest Du Threads trotzdem aktivieren\?</string>
<string name="threads_beta_enable_notice_message">Threads helfen dabei, Unterhaltungen beim Thema zu halten und leichter zu verfolgen. %sDie Aktivierung von Threads aktualisiert die App. Dies kann bei einigen Konten länger dauern.</string>
<string name="threads_notice_migration_message">Wir nähern uns der Veröffentlichung einer öffentlichen Beta für Threads.
\n
@@ -2506,7 +2506,7 @@
<string name="a11y_presence_busy">Beschäftigt</string>
<string name="settings_security_pin_code_use_biometrics_error">Die biometrische Authentifizierung konnte nicht aktiviert werden.</string>
<string name="auth_biometric_key_invalidated_message">Die biometrische Authentifizierung wurde deaktiviert, weil kürzlich eine neue biometrische Authentifizierungsmethode hinzugefügt wurde. Du kannst sie in den Einstellungen wieder aktivieren.</string>
- <string name="error_forbidden_digits_only_username">Der Heimserver akzeptiert keine Benutzernamen, die nur aus Ziffern bestehen.</string>
+ <string name="error_forbidden_digits_only_username">Der Heim-Server akzeptiert keine Benutzernamen, die nur aus Ziffern bestehen.</string>
<string name="sent_live_location">teilten ihren Live-Standort</string>
<string name="ftue_personalize_skip_this_step">Schritt überspringen</string>
<string name="ftue_personalize_submit">Speichern und fortfahren</string>
@@ -2521,13 +2521,13 @@
<string name="ftue_account_created_personalize">Profil personalisieren</string>
<string name="ftue_auth_carousel_workplace_body">${app_name} ist auch für den Arbeitsplatz geeignet. Die sichersten Organisationen der Welt vertrauen darauf.</string>
<string name="send_feedback_threads_info">Threads sind noch in Arbeit, und es stehen neue, aufregende Funktionen an, wie z. B. verbesserte Benachrichtigungen. Wir würden uns sehr über Dein Feedback freuen!</string>
- <string name="direct_room_encryption_enabled_tile_description_future">Nachrichten in diesem Chat werden Ende-zu-Ende-verschlüsselt.</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_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>
- <string name="poll_undisclosed_not_ended">Ergebnisse sind nach Beenden der Abstimmung sichtbar</string>
+ <string name="poll_undisclosed_not_ended">Ergebnisse werden nach Abschluss der Abstimmung sichtbar sein</string>
<string name="ftue_auth_reset_password_breaker_title">Prüfe deine E-Mails.</string>
<string name="ftue_auth_reset_password">Passwort zurücksetzen</string>
<string name="ftue_auth_new_password_subtitle">Gib mindestens 8 Zeichen ein.</string>
@@ -2550,12 +2550,12 @@
<item quantity="one">%d Nachricht gelöscht</item>
<item quantity="other">%d Nachrichten gelöscht</item>
</plurals>
- <string name="labs_enable_element_call_permission_shortcuts">Keine Element Call-Berechtigungsabfragen</string>
- <string name="labs_enable_element_call_permission_shortcuts_summary">Bestätige automatisch Element Call-Widgets und erlaube Kamera- und Mikrofonzugriff</string>
+ <string name="labs_enable_element_call_permission_shortcuts">Keine Element-Call-Berechtigungsabfragen</string>
+ <string name="labs_enable_element_call_permission_shortcuts_summary">Bestätige automatisch Element-Call-Widgets und erlaube Kamera- und Mikrofonzugriff</string>
<string name="create_room_action_go">Los</string>
<string name="ftue_auth_create_account_edit_server_selection">ändern</string>
<string name="ftue_auth_create_account_sso_section_header">oder</string>
- <string name="ftue_auth_sign_in_choose_server_header">Das Zuhause deiner Gespräche</string>
+ <string name="ftue_auth_sign_in_choose_server_header">Der Ort, an dem deine Gespräche stattfinden</string>
<string name="ftue_auth_create_account_choose_server_header">Das zukünftige Zuhause für deine Gespräche</string>
<string name="font_size_use_system">Systemstandard nutzen</string>
<string name="font_size_section_auto">Automatisch festlegen</string>
@@ -2565,9 +2565,9 @@
<string name="auth_reset_password_error_unverified">E-Mail nicht bestätigt, prüfe deinen Posteingang</string>
<string name="ftue_auth_welcome_back_title">Willkommen zurück!</string>
<string name="ftue_auth_forgot_password">Passwort vergessen</string>
- <string name="ftue_auth_login_username_entry">Benutzername / E-Mail / Telefon</string>
+ <string name="ftue_auth_login_username_entry">Nutzername / E-Mail-Adresse / Telefonnummer</string>
<string name="ftue_auth_create_account_title">Erstelle dein Konto</string>
- <string name="ftue_auth_choose_server_entry_hint">Serveradresse</string>
+ <string name="ftue_auth_choose_server_entry_hint">Server-URL</string>
<string name="ftue_auth_choose_server_subtitle">Wie lautet die Adresse deines Servers\? Das wird eine Art Zuhause für deine Daten</string>
<string name="ftue_auth_choose_server_sign_in_subtitle">Wie lautet die Adresse deines Servers\?</string>
<string name="ftue_auth_create_account_password_entry_footer">Muss 8 oder mehr Zeichen umfassen</string>
@@ -2585,7 +2585,7 @@
<string name="create_room">Raum erstellen</string>
<string name="room_list_filter_unreads">Ungelesene</string>
<string name="room_list_filter_people">Personen</string>
- <string name="send_your_first_msg_to_invite">Schreibe deine erste Nachricht, um %s zur Konversation einzuladen</string>
+ <string name="send_your_first_msg_to_invite">Schreibe deine erste Nachricht, um %s zur Unterhaltung einzuladen</string>
<string name="device_manager_settings_active_sessions_show_all">Alle Sitzungen anzeigen (V2, in Arbeit)</string>
<string name="device_manager_sessions_other_description">Für bestmögliche Sicherheit verifiziere deine Sitzungen und melde dich von allen ab, die du nicht erkennst oder nutzt.</string>
<string name="device_manager_sessions_other_title">Andere Sitzungen</string>
@@ -2595,7 +2595,7 @@
<string name="room_list_filter_favourites">Favoriten</string>
<string name="room_list_filter_all">Alle</string>
<string name="location_share_loading_map_error">Karte laden nicht möglich
-\nDieser Heimserver könnte für die Kartendarstellung nicht konfiguriert sein.</string>
+\nDieser Heim-Server könnte für die Kartendarstellung nicht konfiguriert sein.</string>
<string name="a11y_open_settings">Einstellungen öffnen</string>
<string name="verify_invalid_qr_notice">Dieser QR-Code ist fehlerhaft. Bitte versuche es mit einer anderen Methode.</string>
<string name="crosssigning_cannot_verify_this_session_desc">Du wirst deinen verschlüsselten Nachrichtenverlauf nicht abrufen können. Um neu zu beginnen, setze deine Sicherung und Verifizierungsschlüssel zurück.</string>
@@ -2619,24 +2619,94 @@
<string name="timeline_error_room_not_found">Entschuldigung, dieser Raum wurde nicht gefunden.
\nBitte versuche es später erneut.%s</string>
<string name="invites_title">Einladungen</string>
- <string name="device_manager_other_sessions_description_unverified">Nicht verifiziert · Letzte Aktivität %1$s</string>
+ <string name="device_manager_other_sessions_description_unverified">Nicht verifiziert · Neueste Aktivität %1$s</string>
<string name="device_manager_verification_status_unverified">Nicht verifizierte Sitzung</string>
- <string name="device_manager_unverified_sessions_title">Nicht verifizierte Sitzung</string>
+ <string name="device_manager_unverified_sessions_title">Nicht verifizierte Sitzungen</string>
<string name="device_manager_header_section_security_recommendations_description">Verbessere deine Kontosicherheit, indem du diese Empfehlungen beherzigst.</string>
<string name="device_manager_header_section_security_recommendations_title">Sicherheitsempfehlungen</string>
<plurals name="device_manager_other_sessions_description_inactive">
<item quantity="one">Inaktiv seit %1$d+ Tag (%2$s)</item>
<item quantity="other">Inaktiv seit %1$d+ Tagen (%2$s)</item>
</plurals>
- <string name="device_manager_other_sessions_description_verified">Verifiziert · Letzte Aktivität %1$s</string>
+ <string name="device_manager_other_sessions_description_verified">Verifiziert · Neueste Aktivität %1$s</string>
<string name="device_manager_verification_status_verified">Verifizierte Sitzung</string>
<string name="a11y_device_manager_device_type_unknown">Unbekannter Gerätetyp</string>
<string name="invites_empty_title">Nichts Neues.</string>
- <string name="space_list_empty_message">Spaces sind eine neue Art, Räume und Personen zu organisieren. Erstelle einen Space, um zu beginnen.</string>
+ <string name="space_list_empty_message">Spaces sind eine neue Möglichkeit, Räume und Personen zu gruppieren. Erstelle einen Space, um zu beginnen.</string>
<string name="space_list_empty_title">Noch keine Spaces.</string>
<string name="home_empty_no_unreads_message">Hier werden deine ungelesenen Nachrichten erscheinen, wenn du welche hast.</string>
<string name="home_empty_no_unreads_title">Es gibt nichts Neues.</string>
<string name="all_chats">Alle Unterhaltungen</string>
<string name="change_space">Space wechseln</string>
<string name="start_chat">Unterhaltung beginnen</string>
-</resources>
+ <string name="device_manager_filter_bottom_sheet_title">Filter</string>
+ <string name="a11y_device_manager_filter">Filtern</string>
+ <string name="a11y_collapse_space_children">Subspaces von %s schließen</string>
+ <string name="a11y_expand_space_children">Subspaces von %s erweitern</string>
+ <string name="ftue_auth_create_account_username_entry_footer">Andere können dich als %s finden</string>
+ <string name="labs_enable_deferred_dm_summary">Erstelle Unterhaltungen mit der ersten Nachricht</string>
+ <string name="labs_enable_deferred_dm_title">Verzögerte Direktnachrichten</string>
+ <string name="home_layout_preferences_recents">Historie anzeigen</string>
+ <string name="onboarding_new_app_layout_button_try">Probiere es aus</string>
+ <string name="onboarding_new_app_layout_feedback_message">Tippe oben rechts, um eine Rückmeldung zu senden.</string>
+ <string name="onboarding_new_app_layout_feedback_title">Rückmeldung geben</string>
+ <string name="onboarding_new_app_layout_spaces_message">Greife auf deine Spaces (unten rechts) schneller und einfacher denn je zu.</string>
+ <string name="onboarding_new_app_layout_spaces_title">Auf Spaces zugreifen</string>
+ <string name="onboarding_new_app_layout_welcome_message">Um dein ${app_name} zu vereinfachen, sind Tabs nun optional. Verwalte sie mit dem Menü oben rechts.</string>
+ <string name="onboarding_new_app_layout_welcome_title">Willkommen in einer neuen Übersicht!</string>
+ <string name="home_empty_no_rooms_message">Die Komplettlösung für sichere Kommunikation unter Freunden, in Gruppen oder in Organisationen. Erstelle eine Unterhaltung oder trete einem bestehenden Raum bei, um loszulegen.</string>
+ <string name="home_empty_no_rooms_title">Willkommen bei ${app_name},
+\n%s.</string>
+ <string name="home_empty_space_no_rooms_message">Spaces sind eine neue Möglichkeit, Räume und Personen zu gruppieren. Füge einen bestehenden Raum hinzu oder erstelle einen neuen mit der Schaltfläche unten rechts.</string>
+ <string name="home_empty_space_no_rooms_title">%s
+\nsieht ein bisschen leer aus.</string>
+ <string name="device_manager_session_details_device_ip_address">IP-Adresse</string>
+ <string name="device_manager_session_details_session_name">Sitzungsname</string>
+ <string name="device_manager_session_details_description">Anwendung, Gerät und Aktivitätsinformationen.</string>
+ <string name="device_manager_session_details_title">Sitzungsdetails</string>
+ <string name="device_manager_other_sessions_clear_filter">Filter zurücksetzen</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Keine inaktiven Sitzungen gefunden.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Keine nicht verifizierten Sitzungen gefunden.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Keine verifizierten Sitzungen gefunden.</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="one">Erwäge, dich aus alten (ein Tag oder mehr), nicht mehr verwendeten Sitzungen abzumelden.</item>
+ <item quantity="other">Erwäge, dich aus alten (%1$d Tage oder mehr), nicht mehr verwendeten Sitzungen abzumelden.</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Inaktiv</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Für besonders sichere Kommunikation verifiziere deine Sitzungen oder melde dich von ihnen ab, falls du sie nicht mehr identifizieren kannst.</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Nicht verifiziert</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Verifiziert</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">Inaktiv seit %1$d Tag oder länger</item>
+ <item quantity="other">Inaktiv seit %1$d Tagen oder länger</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Inaktiv</string>
+ <string name="device_manager_filter_option_unverified_description">Nicht bereit für sichere Kommunikation</string>
+ <string name="device_manager_filter_option_unverified">Nicht verifiziert</string>
+ <string name="device_manager_filter_option_verified_description">Für sichere Kommunikation bereit</string>
+ <string name="device_manager_filter_option_verified">Verifiziert</string>
+ <string name="device_manager_filter_option_all_sessions">Alle Sitzungen</string>
+ <string name="device_manager_device_title">Gerät</string>
+ <string name="device_manager_session_title">Sitzung</string>
+ <string name="device_manager_current_session_title">Aktuelle Sitzung</string>
+ <plurals name="device_manager_inactive_sessions_description">
+ <item quantity="one">Erwäge, dich aus alten (ein Tag oder mehr), nicht mehr verwendeten Sitzungen abzumelden.</item>
+ <item quantity="other">Erwäge, dich aus alten (%1$d Tage oder mehr), nicht mehr verwendeten Sitzungen abzumelden.</item>
+ </plurals>
+ <string name="device_manager_inactive_sessions_title">Inaktive Sitzungen</string>
+ <string name="device_manager_unverified_sessions_description">Nicht verifizierte Sitzungen verifizieren oder abmelden.</string>
+ <string name="device_manager_other_sessions_view_all">Alle anzeigen (%1$d)</string>
+ <string name="device_manager_verify_session">Sitzung verifizieren</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Diese Sitzung ist für sichere Kommunikation bereit.</string>
+ <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+ <string name="invites_empty_message">Hier erscheinen deine neuen Anfragen und Einladungen.</string>
+ <string name="labs_enable_new_app_layout_summary">Ein vereinfachtes Element mit optionalen Tabs</string>
+ <string name="labs_enable_new_app_layout_title">Neues Layout aktivieren</string>
+ <string name="device_manager_session_details_session_last_activity">Neueste Aktivität</string>
+ <string name="device_manager_session_last_activity">Neueste Aktivität %1$s</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Verifiziere deine aktuelle Sitzung für besonders sichere Kommunikation.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Deine aktuelle Sitzung ist für sichere Kommunikation bereit.</string>
+ <string name="device_manager_view_details">Details anzeigen</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Für bestmögliche Sicherheit und Zuverlässigkeit verifiziere diese Sitzungen oder melde dich von ihr ab.</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">Für die bestmögliche Sicherheit, melde dich von allen Sitzungen ab, die du nicht erkennst oder nicht mehr benutzt.</string>
+</resources>
\ No newline at end of file
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 9bd1dd23b7..dbdbbdbb00 100644
--- a/library/ui-strings/src/main/res/values-et/strings.xml
+++ b/library/ui-strings/src/main/res/values-et/strings.xml
@@ -2594,7 +2594,7 @@
<string name="device_manager_settings_active_sessions_show_all">Näita kõiki sessioone (V2, WIP)</string>
<string name="device_manager_sessions_other_description">Parima turvalisuse nimel verifitseeri kõik oma sessioonid ning logi välja neist, mida sa enam ei kasuta.</string>
<string name="device_manager_sessions_other_title">Muud sessioonid</string>
- <string name="settings_sessions_list">Sessionid</string>
+ <string name="settings_sessions_list">Sessioonid</string>
<string name="a11y_open_spaces">Ava kogukondade loend</string>
<string name="a11y_create_message">Alusta uut vestlust või loo uus jututuba</string>
<string name="room_list_filter_people">Inimesed</string>
@@ -2659,4 +2659,46 @@
<string name="invites_empty_message">Siin saavad olema sinu tulevased päringud ja kutsed.</string>
<string name="a11y_collapse_space_children">Ahenda %s alamkogukonnad</string>
<string name="a11y_expand_space_children">Näita %s alamkogukondi</string>
-</resources>
+ <string name="device_manager_session_details_device_ip_address">IP-aadress</string>
+ <string name="device_manager_session_details_session_last_activity">Viimati kasutusel</string>
+ <string name="device_manager_session_details_session_name">Sessiooni nimi</string>
+ <string name="device_manager_session_details_description">Rakendus, seade ja kasutamise teave.</string>
+ <string name="device_manager_session_details_title">Sessiooni teave</string>
+ <string name="device_manager_other_sessions_clear_filter">Eemalda filter</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Ei leidu sessioone, mis pole aktiivses kasutuses.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Verifitseerimata sessioone ei leidu.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Verifitseeritud sessioone ei leidu.</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="one">Kaalu vanadest ja kasutamata sessioonidest väljalogimist (vanemad kui %1$d või enam päeva).</item>
+ <item quantity="other">Kaalu vanadest ja kasutamata sessioonidest väljalogimist (vanemad kui %1$d või enam päeva).</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Pole pidevas kasutuses</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Turvalise sõnumvahetuse nimel verifitseeri kõik oma sessioonid ning logi neist välja, mida sa enam ei kasuta või ei tunne enam ära.</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Verifitseerimata</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">Parima turvalisuse nimel logi välja neist sessioonidest, mida sa enam ei kasuta või ei tunne ära.</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Verifitseeritud</string>
+ <string name="a11y_device_manager_filter">Filtreeri</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">Pole olnud kasutusel %1$d või enam päeva</item>
+ <item quantity="other">Pole olnud kasutusel %1$d või enam päeva</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Pole pidevas kasutuses</string>
+ <string name="device_manager_filter_option_unverified_description">Pole valmis turvaliseks sõnumivahetuseks</string>
+ <string name="device_manager_filter_option_unverified">Verifitseerimata</string>
+ <string name="device_manager_filter_option_verified_description">Valmis turvaliseks sõnumivahetuseks</string>
+ <string name="device_manager_filter_option_verified">Verifitseeritud</string>
+ <string name="device_manager_filter_option_all_sessions">Kõik sessioonid</string>
+ <string name="device_manager_filter_bottom_sheet_title">Filtreeri</string>
+ <string name="device_manager_session_last_activity">Viimati kasutusel %1$s</string>
+ <string name="device_manager_device_title">Seade</string>
+ <string name="device_manager_session_title">Sessioonid</string>
+ <string name="device_manager_current_session_title">Praegune sessioon</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Parima turvalisuse ja töökindluse nimel verifitseeri see sessioon või logi ta võrgust välja.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Turvalise sõnumivahetuse nimel palun verifitseeri oma praegune sessioon.</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">See sessioon on valmis turvaliseks sõnumivahetuseks.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Sinu praegune sessioon on valmis turvaliseks sõnumivahetuseks.</string>
+ <string name="labs_enable_deferred_dm_summary">Alusta otsevestlust esimese sõnumiga</string>
+ <string name="labs_enable_deferred_dm_title">Võta kasutusele viivitusega otsevestlused</string>
+ <string name="labs_enable_new_app_layout_summary">Lihtsustatud Element valikuliste kaartidega</string>
+ <string name="labs_enable_new_app_layout_title">Võta kasutusele rakenduse uus välimus</string>
+</resources>
\ No newline at end of file
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 400a8121f9..9012bc2ebe 100644
--- a/library/ui-strings/src/main/res/values-fa/strings.xml
+++ b/library/ui-strings/src/main/res/values-fa/strings.xml
@@ -2700,4 +2700,9 @@
<string name="labs_enable_deferred_dm_summary">ایجاد پیام خصوصی فقط در نخستین پیام</string>
<string name="labs_enable_new_app_layout_summary">المنتی ساده شده با زبانههای انتخابی</string>
<string name="labs_enable_new_app_layout_title">به کار انداختن چینش جدید</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">تأیید نشستهایتان برای پیامرسانی امن بهبود یافته یا خروج از آنهایی که تشخیصشان نداده یا دیگر استفاده نمیکنید.</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">غیرفعّال برای ۱ روز یا بیشتر</item>
+ <item quantity="other">غیرفعّال برای %1$d روز یا بیشتر</item>
+ </plurals>
</resources>
\ No newline at end of file
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 5a19ccf2da..c7100e3a1e 100644
--- a/library/ui-strings/src/main/res/values-fr/strings.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings.xml
@@ -2668,4 +2668,46 @@
<string name="a11y_collapse_space_children">Réduire %s enfants</string>
<string name="a11y_expand_space_children">Développer %s enfants</string>
<string name="change_space">Changer d’espace</string>
-</resources>
+ <string name="device_manager_session_details_device_ip_address">Adresse IP</string>
+ <string name="device_manager_session_details_session_last_activity">Dernière activité</string>
+ <string name="device_manager_session_details_session_name">Nom de la session</string>
+ <string name="device_manager_session_details_description">Application, appareil et information sur l’activité.</string>
+ <string name="device_manager_session_details_title">Détails de session</string>
+ <string name="device_manager_other_sessions_clear_filter">Supprimer les filtres</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Aucune session inactive n’a été trouvée.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Aucune session non vérifiée n’a été trouvée.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Aucune session vérifiée n’a été trouvée.</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="one">Pensez à vous déconnecter des anciennes sessions (%1$d jour ou plus) que vous n’utilisez plus.</item>
+ <item quantity="other">Pensez à vous déconnecter des anciennes sessions (%1$d jours ou plus) que vous n’utilisez plus.</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Inactif</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Vérifiez vos sessions pour améliorer la sécurité de votre messagerie, ou déconnectez celles que vous ne connaissez pas ou n’utilisez plus.</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Non vérifié</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">Pour une meilleure sécurité, déconnectez toutes les sessions que vous ne connaissez pas ou que vous n’utilisez plus.</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Vérifié</string>
+ <string name="a11y_device_manager_filter">Filtrer</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">Inactif depuis %1$d jour ou plus</item>
+ <item quantity="other">Inactif depuis %1$d jours ou plus</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Inactif</string>
+ <string name="device_manager_filter_option_unverified_description">Pas prêt pour une messagerie sécurisée</string>
+ <string name="device_manager_filter_option_unverified">Non vérifié</string>
+ <string name="device_manager_filter_option_verified_description">Prêt pour une messagerie sécurisée</string>
+ <string name="device_manager_filter_option_verified">Vérifié</string>
+ <string name="device_manager_filter_option_all_sessions">Toutes les sessions</string>
+ <string name="device_manager_filter_bottom_sheet_title">Filtrer</string>
+ <string name="device_manager_session_last_activity">Dernière activité %1$s</string>
+ <string name="device_manager_device_title">Appareil</string>
+ <string name="device_manager_session_title">Session</string>
+ <string name="device_manager_current_session_title">Cette session</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Vérifiez ou déconnectez cette session pour une meilleure sécurité et fiabilité.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Vérifiez votre session pour une sécurité accrue de votre messagerie.</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Cette session est prête pour l’envoi de messages sécurisés.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Votre session est prête pour l’envoi de messages sécurisés.</string>
+ <string name="labs_enable_deferred_dm_summary">Créer la conversation seulement lors du premier message</string>
+ <string name="labs_enable_deferred_dm_title">Activer les conversations privées différées</string>
+ <string name="labs_enable_new_app_layout_summary">Un Element simplifié avec des onglets optionnels</string>
+ <string name="labs_enable_new_app_layout_title">Activer la nouvelle présentation</string>
+</resources>
\ No newline at end of file
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 3068556fe4..cac0a2eb5d 100644
--- a/library/ui-strings/src/main/res/values-hu/strings.xml
+++ b/library/ui-strings/src/main/res/values-hu/strings.xml
@@ -2668,4 +2668,46 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
<item quantity="other">%1$d+ napja inaktív (%2$s)</item>
</plurals>
<string name="invites_empty_message">Itt láthatók a meghívók és elvégzendő műveletek.</string>
-</resources>
+ <string name="device_manager_session_details_device_ip_address">IP cím</string>
+ <string name="device_manager_session_details_session_last_activity">Utolsó tevékenység</string>
+ <string name="device_manager_session_details_session_name">Munkamenet neve</string>
+ <string name="device_manager_session_details_description">Alkalmazás, eszköz és aktivitás információ.</string>
+ <string name="device_manager_session_details_title">Munkamenet információk</string>
+ <string name="device_manager_other_sessions_clear_filter">Szűrő törlése</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Nincs inaktív munkamenet.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Nincs ellenőrizetlen munkamenet.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Nincs ellenőrzött munkamenet.</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="one">Fontold meg, hogy kijelentkezel a régi munkamenetekből (%1$d napja vagy régebben használtál) amit már nem használsz.</item>
+ <item quantity="other">Fontold meg, hogy kijelentkezel a régi munkamenetekből (%1$d napja vagy régebben használtál) amit már nem használsz.</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Inaktív</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Erősítse meg a munkameneteit a még biztonságosabb csevegéshez vagy jelentkezzen ki ezekből, ha nem ismeri fel vagy már nem használja őket.</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Ellenőrizetlen</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">A legjobb biztonság érdekében jelentkezz ki minden olyan munkamenetből amit nem ismersz fel vagy régen használtál már.</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Hitelesített</string>
+ <string name="a11y_device_manager_filter">Szűrés</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">%1$d napja inaktív</item>
+ <item quantity="other">%1$d napja inaktív</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Inaktív</string>
+ <string name="device_manager_filter_option_unverified_description">Nem áll készen a biztonságos üzenetküldésre</string>
+ <string name="device_manager_filter_option_unverified">Ellenőrizetlen</string>
+ <string name="device_manager_filter_option_verified_description">Felkészülve a biztonságos üzenetküldésre</string>
+ <string name="device_manager_filter_option_verified">Hitelesített</string>
+ <string name="device_manager_filter_option_all_sessions">Minden munkamenet</string>
+ <string name="device_manager_filter_bottom_sheet_title">Szűrés</string>
+ <string name="device_manager_session_last_activity">Utolsó aktivitás %1$s</string>
+ <string name="device_manager_device_title">Eszköz</string>
+ <string name="device_manager_session_title">Munkamenet</string>
+ <string name="device_manager_current_session_title">Jelenlegi munkamenet</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">A jobb biztonság vagy megbízhatóság érdekében ellenőrizze vagy jelentkezzen ki ebből a munkamenetből.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Az aktuális munkamenet készen áll a biztonságos üzenetküldésre.</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Ez a munkamenet beállítva a biztonságos üzenetküldéshez.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Az aktuális munkamenet készen áll a biztonságos üzenetküldésre.</string>
+ <string name="labs_enable_deferred_dm_summary">Közvetlen beszélgetés indítása csak az első üzenettel</string>
+ <string name="labs_enable_deferred_dm_title">Késleltetett közvetlen üzenetek engedélyezése</string>
+ <string name="labs_enable_new_app_layout_summary">Egyszerűsített Element opcionálisan lapokkal</string>
+ <string name="labs_enable_new_app_layout_title">Új kinézet engedélyezése</string>
+</resources>
\ No newline at end of file
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 3b30950bd1..7b103a9131 100644
--- a/library/ui-strings/src/main/res/values-in/strings.xml
+++ b/library/ui-strings/src/main/res/values-in/strings.xml
@@ -2617,5 +2617,45 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
<string name="space_list_empty_title">Belum ada space.</string>
<string name="a11y_collapse_space_children">Tutup %s anak</string>
<string name="a11y_expand_space_children">Buka %s anak</string>
- <string name="change_space">Buat Space</string>
-</resources>
+ <string name="change_space">Ubah Space</string>
+ <string name="device_manager_session_details_device_ip_address">Alamat IP</string>
+ <string name="device_manager_session_details_session_last_activity">Aktivitas terakhir</string>
+ <string name="device_manager_session_details_session_name">Nama sesi</string>
+ <string name="device_manager_session_details_description">Informasi aplikasi, perangkat, dan aktivitas.</string>
+ <string name="device_manager_session_details_title">Detail sesi</string>
+ <string name="device_manager_other_sessions_clear_filter">Hapus Saringan</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Tidak ditemukan sesi yang tidak aktif.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Tidak ditemukan sesi yang belum diverifikasi.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Tidak ditemukan sesi yang terverifikasi.</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="other">Pertimbangkan untuk mengeluarkan sesi lawas (%1$d hari atau lebih) yang Anda tidak gunakan lagi.</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Tidak aktif</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Verifikasi sesi Anda untuk perpesanan aman yang terbaik atau keluarkan sesi yang Anda tidak kenal atau gunakan lagi.</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Belum diverifikasi</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">Untuk keamanan yang terbaik, keluarkan sesi yang Anda tidak kenal atau gunakan lagi.</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Terverifikasi</string>
+ <string name="a11y_device_manager_filter">Saring</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="other">Tidak aktif selama %1$d hari atau lebih</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Tidak aktif</string>
+ <string name="device_manager_filter_option_unverified_description">Belum siap untuk perpesanan aman</string>
+ <string name="device_manager_filter_option_unverified">Belum diverifikasi</string>
+ <string name="device_manager_filter_option_verified_description">Siap untuk perpesanan aman</string>
+ <string name="device_manager_filter_option_verified">Terverifikasi</string>
+ <string name="device_manager_filter_option_all_sessions">Semua sesi</string>
+ <string name="device_manager_filter_bottom_sheet_title">Saring</string>
+ <string name="device_manager_session_last_activity">Aktivitas terakhir %1$s</string>
+ <string name="device_manager_device_title">Perangkat</string>
+ <string name="device_manager_session_title">Sesi</string>
+ <string name="device_manager_current_session_title">Sesi Saat Ini</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Verifikasi atau keluarkan sesi ini untuk keamanan dan keandalan yang terbaik.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Verifikasi sesi Anda saat ini untuk perpesanan aman yang baik.</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Sesi ini siap untuk perpesanan aman.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Sesi Anda saat ini siap untuk perpesanan aman.</string>
+ <string name="labs_enable_deferred_dm_summary">Buat pesan langsung hanya pada pesan pertama</string>
+ <string name="labs_enable_deferred_dm_title">Aktifkan pesan langsung tangguhan</string>
+ <string name="labs_enable_new_app_layout_summary">Sebuah Element yang sederhana dengan fitur tab opsional</string>
+ <string name="labs_enable_new_app_layout_title">Aktifkan tata letak baru</string>
+</resources>
\ No newline at end of file
diff --git a/library/ui-strings/src/main/res/values-is/strings.xml b/library/ui-strings/src/main/res/values-is/strings.xml
index d25d66bfba..69191e1741 100644
--- a/library/ui-strings/src/main/res/values-is/strings.xml
+++ b/library/ui-strings/src/main/res/values-is/strings.xml
@@ -1536,7 +1536,7 @@
<string name="external_link_confirmation_title">Yfirfarðu þennan tengil</string>
<string name="secure_backup_reset_if_you_reset_all">Ef þú frumstillir allt</string>
<string name="qr_code_scanned_verif_waiting_notice">Næstum því búið! Bíð eftir staðfestingu…</string>
- <string name="add_a_topic_link_text">Bæta við umræðuefni</string>
+ <string name="add_a_topic_link_text">Bættu við umræðuefni</string>
<string name="crosssigning_verify_this_session">Sannprófa þessa innskráningu</string>
<string name="settings_active_sessions_signout_device">Skrá út úr þessari setu</string>
<string name="verification_conclusion_ok_notice">Skilaboð við þennan notanda eru enda-í-enda dulrituð þannig að enginn annar getur lesið þau.</string>
@@ -1751,7 +1751,7 @@
<string name="settings_developer_mode">Forritarahamur</string>
<string name="soft_logout_clear_data_title">Hreinsa persónuleg gögn</string>
<string name="login_server_matrix_org_text">Taktu þátt ókeypis ásamt milljónum annarra á stærsta almenningsþjóninum</string>
- <string name="ftue_auth_use_case_skip_partial">sleppt þessari spurningu</string>
+ <string name="ftue_auth_use_case_skip_partial">Sleppa þessari spurningu</string>
<string name="ftue_auth_carousel_encrypted_title">Örugg skilaboð.</string>
<string name="settings_discovery_bad_identity_server">Gat ekki tengst við auðkennisþjón</string>
<string name="keys_backup_settings_status_not_setup">Dulritunarlyklarnir þínir eru ekki öryggisafritaðir úr þessari setu.</string>
@@ -1990,10 +1990,10 @@
<string name="seen_by">Séð af</string>
<string name="ftue_personalize_skip_this_step">Sleppa þessu skrefi</string>
<string name="ftue_personalize_submit">Vista og halda áfram</string>
- <string name="ftue_personalize_complete_subtitle">Kjörstillingarnar þínar hafa verið vistaðar.</string>
+ <string name="ftue_personalize_complete_subtitle">Farðu hvenær sem er í stillingarnar til að breyta notandasniðinu þínu.</string>
<string name="ftue_personalize_complete_title">Nú ertu tilbúin(n)!</string>
<string name="ftue_personalize_lets_go">Hefjumst handa</string>
- <string name="ftue_profile_picture_subtitle">Þú getur breytt þessu hvenær sem er.</string>
+ <string name="ftue_profile_picture_subtitle">Þú getur breytt þessu hvenær sem er</string>
<string name="ftue_profile_picture_title">Bættu við auðkennismynd</string>
<string name="ftue_display_name_entry_footer">Þú getur breytt þessu síðar</string>
<string name="ftue_display_name_entry_title">Birtingarnafn</string>
@@ -2012,4 +2012,206 @@
<string name="action_try_it_out">Prófaðu það</string>
<string name="action_disable">Gera óvirkt</string>
<string name="initial_sync_request_title">Upphafleg samstillingarbeiðni</string>
-</resources>
+ <string name="onboarding_new_app_layout_welcome_title">Velkomin í nýja sýn!</string>
+ <string name="location_share_live_view">Skoða staðsetningu í rauntíma</string>
+ <string name="space_explore_filter_no_result_description">Sumar niðurstöður gætu verið faldar þar sem þær eru einkamál, þá þarftu boð til að geta séð þær.</string>
+ <string name="space_leave_prompt_msg_as_admin">Þú ert eini stjórnandi þessa svæðis. Ef þú yfirgefur það verður enginn annar sem er með stjórn yfir því.</string>
+ <string name="space_leave_prompt_msg_private">Þú munt ekki geta tekið þátt aftur nema þér verði boðið aftur.</string>
+ <string name="space_leave_radio_button_none">Yfirgefa ekkert</string>
+ <string name="space_leave_radio_button_all">Yfirgefa allt</string>
+ <string name="space_leave_radio_buttons_title">Efni á þessu svæði</string>
+ <string name="room_alias_preview_not_found">Þetta samnefni er ekki aðgengilegt í augnablikinu.
+\nPrófaðu aftur síðar, eða spurðu einhvern stjórnanda hvort þú hafir aðgang.</string>
+ <string name="command_description_leave_room">Fara af spjallrás með uppgefið auðkenni (eða fyrirliggjandi spjallrás ef þetta er núll)</string>
+ <string name="command_description_join_space">Taka þátt í svæði með uppgefið auðkenni</string>
+ <string name="settings_security_pin_code_use_biometrics_error">Gat ekki virkjað auðkenningu með lífkennum.</string>
+ <string name="identity_server_set_alternative_notice">Annars geturðu sett inn slóð á hvaða auðkennisþjón sem er</string>
+ <string name="identity_server_set_default_notice">Heimaþjónninn þinn (%1$s) stingur upp á að nota %2$s sem auðkenningarþjón fyrir þig</string>
+ <string name="identity_server_user_consent_not_provided">Samþykki notandans hefur ekki verið gefið.</string>
+ <string name="identity_server_error_no_identity_server_configured">Stilltu fyrst auðkennisþjón.</string>
+ <string name="identity_server_error_outdated_home_server">Þessi aðgerð er ekki möguleg. Heimaþjónninn er úreltur.</string>
+ <string name="user_code_info_text">Deildu þessum kóða með fólki svo viðkomandi geti skannað hann, bætt þér við og byrjað að spjalla.</string>
+ <string name="error_forbidden_digits_only_username">Heimaþjónn notandans samþykkir ekki notendanöfn einungis með tölustöfum.</string>
+ <string name="settings_security_prevent_screenshots_title">Hindra skjámyndatöku af forritinu</string>
+ <string name="settings_notification_configuration">Uppsetning tilkynninga</string>
+ <string name="error_failed_to_import_keys">Mistókst að flytja inn lykla</string>
+ <string name="qr_code_scanned_self_verif_notice">Næstum því búið! Sýnir hitt tækið gátmerki\?</string>
+ <string name="room_created_summary_no_topic_creation_text">%s svo fólk viti að um hvað málin snúist.</string>
+ <string name="send_your_first_msg_to_invite">Sendu fyrstu skilaboðin þín til að bjóða %s að spjalla</string>
+ <string name="this_is_the_beginning_of_room_no_name">Þetta er upphafið á þessu samtali.</string>
+ <string name="this_is_the_beginning_of_room">Þetta er upphafið á %s.</string>
+ <string name="room_created_summary_item">%s bjó til og stillti spjallrásina.</string>
+ <string name="encryption_unknown_algorithm_tile_description">Dulritunin sem notuð er í þessari spjallrás er ekki studd</string>
+ <string name="encryption_misconfigured">Dulritun er rangt stillt</string>
+ <string name="direct_room_encryption_enabled_tile_description_future">Skilaboð í þessu spjalli verða enda-í-enda dulrituð.</string>
+ <string name="encryption_enabled_tile_description">Skilaboð í þessari spjallrás eru enda-í-enda dulrituð. Lærðu meira um þetta og yfirfarðu notendur í notandasniðum þeirra.</string>
+ <string name="bootstrap_cancel_text">Ef þú hættir við núna, geturðu tapað dulrituðum skilaboðum og gögnum ef þú missir aðgang að innskráningum þínum.
+\n
+\nÞú getur víka sett upp örugga afritun og sýslað með dulritunarlyklana þína í stillingunum.</string>
+ <string name="bootstrap_crosssigning_progress_initializing">Gef út útbúna auðkennislykla</string>
+ <string name="bootstrap_loading_title">Set upp endurheimtu.</string>
+ <string name="bootstrap_dont_reuse_pwd">Ekki nota lykilorðið fyrir aðganginn þinn.</string>
+ <string name="message_key">Lykill skilaboða</string>
+ <string name="verify_new_session_was_not_me">Þetta var ekki ég</string>
+ <string name="settings_key_requests">Beiðnir um lykla</string>
+ <string name="login_default_session_public_name">${app_name} fyrir Android</string>
+ <string name="qr_code_scanned_by_other_notice">Næstum því búið! Sýnir %s gátmerki\?</string>
+ <string name="room_member_profile_failed_to_get_devices">Mistókst að ná í setur</string>
+ <plurals name="settings_active_sessions_count">
+ <item quantity="one">%d virk seta</item>
+ <item quantity="other">%d virkar setur</item>
+ </plurals>
+ <string name="settings_failed_to_get_crypto_device_info">Engar dulkóðunarupplýsingar tiltækar</string>
+ <string name="room_settings_enable_encryption_no_permission">Þú hefur ekki heimild til að virkja dulritun á þessari spjallrás.</string>
+ <string name="ftue_auth_phone_confirmation_subtitle">Kóði var sendur til: %s</string>
+ <string name="ftue_auth_phone_confirmation_title">Staðfestu símanúmerið þitt</string>
+ <string name="ftue_auth_phone_confirmation_entry_title">Staðfestingarkóði</string>
+ <string name="ftue_auth_choose_server_ems_title">Viltu hýsa þinn eigin netþjón\?</string>
+ <string name="ftue_auth_choose_server_sign_in_subtitle">Hvert er vistfang netþjónsins þíns\?</string>
+ <string name="ftue_auth_choose_server_subtitle">Hvert er vistfang netþjónsins þíns\? Þetta er staður sem geymir öll gögnin þín</string>
+ <string name="ftue_auth_choose_server_title">Veldu netþjón fyrir þig</string>
+ <string name="ftue_auth_sign_in_choose_server_header">Þar sem samtölin þín eru</string>
+ <string name="ftue_auth_create_account_choose_server_header">Þar sem samtölin þín verða</string>
+ <string name="ftue_auth_create_account_password_entry_footer">Verður að vera að minnsta kosti 8 stafir</string>
+ <string name="ftue_auth_create_account_username_entry_footer">Aðrir geta fundið þig %s</string>
+ <string name="ftue_account_created_subtitle">%s aðgangur þinn hefur verið útbúinn</string>
+ <string name="ftue_account_created_take_me_home">Fara á forsíðuna</string>
+ <string name="ftue_account_created_personalize">Persónugera notandasnið</string>
+ <string name="ftue_auth_use_case_join_existing_server">Ætlarðu að ganga til liðs við fyrirliggjandi netþjón\?</string>
+ <string name="ftue_auth_use_case_skip">Ekki ennþá viss\? %s</string>
+ <string name="ftue_auth_use_case_title">Við hverja muntu helst spjalla\?</string>
+ <string name="ftue_auth_carousel_workplace_body">${app_name} er líka frábært fyrir vinnustaðinn. Heimsins öruggustu samtök treysta því.</string>
+ <string name="ftue_auth_carousel_encrypted_body">Enda-í-enda dulritað og ekkert símanúmer nauðsynlegt. Engar auglýsingar eða gagnasöfnun.</string>
+ <string name="ftue_auth_carousel_control_body">Veldu hvar á að geyma samtölin þín, sem gefur þér stjórnina og algert sjálfstæði. Tengt í gegnum Matrix.</string>
+ <string name="ftue_auth_carousel_secure_body">Örugg og óháð samskipti sem gefa þér færi á að ræða málin í friði rétt eins og þetta sé maður á mann í heimahúsi.</string>
+ <string name="ftue_auth_carousel_workplace_title">Skilaboð fyrir teymið þitt.</string>
+ <string name="reaction_search_type_hint">Skrifaðu stikkorð til að finna viðbrögð.</string>
+ <string name="a11y_open_spaces">Opna svæðalista</string>
+ <string name="room_preview_no_preview_join">Ekki er hægt að forskoða þessa spjallrás. Viltu taka þátt í henni\?</string>
+ <string name="room_preview_not_found">Þessi spjallrás er ekki aðgengileg í augnablikinu.
+\nPrófaðu aftur síðar, eða spurðu einhvern stjórnanda hvort þú hafir aðgang.</string>
+ <string name="malformed_message">Rangt sniðinn atburður, get ekki birt hann</string>
+ <string name="event_redacted_by_user_reason">Atburði eytt af notanda</string>
+ <string name="keys_backup_banner_update_line1">Nýjir lyklar fyrir örugg skilaboð</string>
+ <string name="analytics_opt_in_content">Hjálpaðu okkur við að greina vandamál og bæta ${app_name} með því að deila nafnlausum gögnum varðandi notkun. Til að skilja hvernig fólk notar saman mörg tæki, munum við útbúa tilviljanakennt auðkenni, sem tækin þín deila.
+\n
+\nÞú getur lesið alla skilmála okkar %s.</string>
+ <string name="settings_autoplay_animated_images_title">Spila hreyfimyndir sjálfvirkt</string>
+ <string name="settings_troubleshoot_test_endpoint_registration_failed">Mistókst að skrá endapunkt á heimaþjóninn:
+\n%1$s</string>
+ <string name="settings_troubleshoot_test_endpoint_registration_success">Það tókst að skrá endapunkt á heimaþjóninn.</string>
+ <string name="settings_troubleshoot_test_endpoint_registration_title">Skráning endapunkts</string>
+ <plurals name="search_space_multiple_parents">
+ <item quantity="one">%1$s og %2$d í viðbót</item>
+ <item quantity="other">%1$s og %2$d í viðbót</item>
+ </plurals>
+ <string name="space_settings_permissions_subtitle">Skoða og uppfæra hlutverk sem krafist er til að breyta ýmsum þáttum svæðisins.</string>
+ <string name="room_settings_permissions_subtitle">Skoða og uppfæra hlutverk sem krafist er til að breyta ýmsum þáttum spjallrásarinnar.</string>
+ <string name="auth_reset_password_error_unverified">Tölvupóstfang ekki staðfest, athugaðu pósthólfið þitt</string>
+ <string name="invites_empty_title">Ekkert nýtt.</string>
+ <string name="space_list_empty_title">Engin svæði ennþá.</string>
+ <string name="labs_enable_new_app_layout_summary">Einfaldað Element með valkvæðum flipum</string>
+ <string name="labs_enable_new_app_layout_title">Virkja nýja framsetningu</string>
+ <string name="home_layout_preferences">Kjörstillingar framsetningar</string>
+ <string name="change_space">Skipta um svæði</string>
+ <string name="all_chats">Allar spjallrásir</string>
+ <string name="onboarding_new_app_layout_button_try">Prófaðu það</string>
+ <string name="onboarding_new_app_layout_feedback_title">Gefðu umsögn</string>
+ <string name="device_manager_session_details_device_ip_address">IP-vistfang</string>
+ <string name="device_manager_session_details_session_last_activity">Síðasta virkni</string>
+ <string name="device_manager_session_details_session_name">Nafn á setu</string>
+ <string name="device_manager_session_details_title">Nánar um setuna</string>
+ <string name="device_manager_other_sessions_clear_filter">Hreinsa síu</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Engar óvirkar setur fundust.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Engar óstaðfestar setur fundust.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Engar staðfestar setur fundust.</string>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Óvirkt</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Óstaðfest</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Staðfest</string>
+ <string name="a11y_device_manager_filter">Sía</string>
+ <string name="device_manager_filter_option_inactive">Óvirkt</string>
+ <string name="device_manager_filter_option_unverified">Óstaðfest</string>
+ <string name="device_manager_filter_option_verified">Staðfest</string>
+ <string name="device_manager_filter_option_all_sessions">Allar setur</string>
+ <string name="device_manager_filter_bottom_sheet_title">Sía</string>
+ <string name="device_manager_session_last_activity">Síðasta virkni %1$s</string>
+ <string name="device_manager_device_title">Tæki</string>
+ <string name="device_manager_session_title">Seta</string>
+ <string name="device_manager_current_session_title">Núverandi seta</string>
+ <string name="device_manager_unverified_sessions_title">Óstaðfestar setur</string>
+ <string name="device_manager_other_sessions_view_all">Skoða allt (%1$d)</string>
+ <string name="device_manager_view_details">Skoða nánar</string>
+ <string name="device_manager_verify_session">Sannprófa setu</string>
+ <string name="device_manager_verification_status_unverified">Óstaðfest seta</string>
+ <string name="device_manager_verification_status_verified">Staðfest seta</string>
+ <string name="a11y_device_manager_device_type_unknown">Óþekkt tegund tækis</string>
+ <string name="a11y_device_manager_device_type_desktop">Skjáborð</string>
+ <string name="a11y_device_manager_device_type_web">Vefur</string>
+ <string name="a11y_device_manager_device_type_mobile">Farsími</string>
+ <string name="live_location_labs_promotion_switch_title">Virkja deilingu staðsetninga</string>
+ <string name="settings_troubleshoot_test_current_gateway_title">Netgátt</string>
+ <string name="settings_troubleshoot_test_current_distributor_title">Aðferð</string>
+ <string name="unifiedpush_distributor_background_sync">Samstilling í bakgrunni</string>
+ <string name="unifiedpush_distributor_fcm_fallback">Google þjónustur</string>
+ <string name="live_location_share_location_item_share">Deila staðsetningu</string>
+ <string name="location_share_live_remaining_time">%1$s hætti</string>
+ <string name="poll_undisclosed_not_ended">Niðurstöður birtast einungis eftir að könnuninni hefur lokið</string>
+ <string name="space_explore_filter_no_result_title">Engar niðurstöður fundust</string>
+ <string name="a11y_open_settings">Opna stillingar</string>
+ <string name="bootstrap_crosssigning_save_cloud">Afritaðu hann á einkageymslu sem þú átt í tölvuskýi</string>
+ <string name="bootstrap_crosssigning_save_usb">Vistaðu hann á USB-lykil eða öryggisdisk</string>
+ <string name="bootstrap_crosssigning_print_it">Prentaðu hann og geymdu á öruggum stað</string>
+ <string name="bootstrap_info_text_2">Settu inn öryggisfrasa sem aðeins þú þekkir, þetta er notað til að verja leyndarmálin sem þú geymir á netþjóninum þínum.</string>
+ <string name="enter_account_password">Settu inn %s til að halda áfram.</string>
+ <string name="crosssigning_cannot_verify_this_session">Tókst ekki að sannreyna þetta tæki</string>
+ <string name="device_manager_sessions_other_title">Aðrar setur</string>
+ <string name="settings_sessions_list">Setur</string>
+ <string name="ftue_auth_login_username_entry">Notandanafn / tölvupóstfang / símanúmer</string>
+ <string name="ftue_auth_captcha_title">Ertu mannvera\?</string>
+ <string name="ftue_auth_password_reset_confirmation">Endurstilling lykilorðs</string>
+ <string name="ftue_auth_forgot_password">Gleymt lykilorð</string>
+ <string name="ftue_auth_email_resend_email">Senda tölvupóst aftur</string>
+ <string name="ftue_auth_email_verification_title">Skoðaðu tölvupóstinn þinn</string>
+ <string name="ftue_auth_phone_confirmation_resend_code">Endursenda kóða</string>
+ <string name="ftue_auth_sign_out_all_devices">Skrá út öll tæki</string>
+ <string name="ftue_auth_reset_password">Endurstilla lykilorð</string>
+ <string name="ftue_auth_new_password_title">Veldu nýtt lykilorð</string>
+ <string name="ftue_auth_new_password_entry_title">Nýtt lykilorð</string>
+ <string name="ftue_auth_reset_password_breaker_title">Athugaðu tölvupóstinn þinn.</string>
+ <string name="ftue_auth_phone_entry_title">Símanúmer</string>
+ <string name="ftue_auth_phone_title">Settu inn símanúmerið þitt</string>
+ <string name="ftue_auth_email_entry_title">Tölvupóstur</string>
+ <string name="ftue_auth_email_title">Settu inn tölvupóstfangið þitt</string>
+ <string name="ftue_auth_choose_server_ems_cta">Hafðu samband</string>
+ <string name="ftue_auth_choose_server_entry_hint">Slóð netþjóns</string>
+ <string name="ftue_auth_welcome_back_title">Velkomin(n) aftur!</string>
+ <string name="ftue_auth_create_account_edit_server_selection">Breyta</string>
+ <string name="ftue_auth_create_account_sso_section_header">Eða</string>
+ <string name="ftue_auth_create_account_title">Búa til aðganginn þinn</string>
+ <string name="ftue_auth_use_case_subtitle">Við munum hjálpa þér að tengjast</string>
+ <string name="create_room_action_go">Fara</string>
+ <string name="room_preview_no_preview">Þessa spjallrás er ekki hægt að forskoða</string>
+ <string name="updating_your_data">Uppfæri gögnin þín…</string>
+ <string name="room_list_filter_people">Fólk</string>
+ <string name="room_list_filter_favourites">Eftirlæti</string>
+ <string name="room_list_filter_unreads">Ólesið</string>
+ <string name="room_list_filter_all">Allt</string>
+ <string name="font_size_use_system">Nota sjálfgefnar kerfisstillingar</string>
+ <string name="font_size_section_manually">Velja handvirkt</string>
+ <string name="font_size_section_auto">Setja sjálfvirkt</string>
+ <string name="font_size_title">Veldu leturstærð</string>
+ <string name="search_space_two_parents">%1$s og %2$s</string>
+ <string name="invites_title">Boðsgestir</string>
+ <string name="home_layout_preferences_sort_name">A-Ö</string>
+ <string name="home_layout_preferences_sort_activity">Virkni</string>
+ <string name="home_layout_preferences_sort_by">Raða eftir</string>
+ <string name="home_layout_preferences_recents">Birta nýlegt</string>
+ <string name="home_layout_preferences_filters">Sýna síur</string>
+ <string name="action_next">Næsta</string>
+ <string name="time_unit_second_short">sek</string>
+ <string name="time_unit_minute_short">mín</string>
+ <string name="time_unit_hour_short">klst</string>
+ <string name="explore_rooms">Kanna spjallrásir</string>
+ <string name="create_room">Búa til spjallrás</string>
+ <string name="start_chat">Hefja spjall</string>
+</resources>
\ No newline at end of file
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 b7b0fe91af..b2f9fa9238 100644
--- a/library/ui-strings/src/main/res/values-it/strings.xml
+++ b/library/ui-strings/src/main/res/values-it/strings.xml
@@ -2659,4 +2659,46 @@
<string name="a11y_collapse_space_children">Riduci contenuto di %s</string>
<string name="a11y_expand_space_children">Espandi contenuto di %s</string>
<string name="change_space">Cambia spazio</string>
-</resources>
+ <string name="device_manager_session_details_device_ip_address">Indirizzo IP</string>
+ <string name="device_manager_session_details_session_last_activity">Ultima attività</string>
+ <string name="device_manager_session_details_session_name">Nome sessione</string>
+ <string name="device_manager_session_details_description">Applicazione, dispositivo e informazioni di attività.</string>
+ <string name="device_manager_session_details_title">Dettagli sessione</string>
+ <string name="device_manager_other_sessions_clear_filter">Annulla filtro</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Nessuna sessione inattiva trovata.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Nessuna sessione non verificata trovata.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Nessuna sessione verificata trovata.</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="one">Considera di disconnettere le sessioni vecchie (%1$d giorno o più) che non usi più.</item>
+ <item quantity="other">Considera di disconnettere le sessioni vecchie (%1$d giorni o più) che non usi più.</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Inattivo</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Verifica le tue sessioni per avere conversazioni più sicure o disconnetti quelle che non riconosci o che non usi più.</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Non verificato</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">Per una maggiore sicurezza, disconnetti tutte le sessioni che non riconosci o che non usi più.</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Verificato</string>
+ <string name="a11y_device_manager_filter">Filtra</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">Inattivo da %1$d giorno o più</item>
+ <item quantity="other">Inattivo da %1$d giorni o più</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Inattivo</string>
+ <string name="device_manager_filter_option_unverified_description">Non pronto per messaggi sicuri</string>
+ <string name="device_manager_filter_option_unverified">Non verificato</string>
+ <string name="device_manager_filter_option_verified_description">Pronto per messaggi sicuri</string>
+ <string name="device_manager_filter_option_verified">Verificato</string>
+ <string name="device_manager_filter_option_all_sessions">Tutte le sessioni</string>
+ <string name="device_manager_filter_bottom_sheet_title">Filtra</string>
+ <string name="device_manager_session_last_activity">Ultima attività %1$s</string>
+ <string name="device_manager_device_title">Dispositivo</string>
+ <string name="device_manager_session_title">Sessione</string>
+ <string name="device_manager_current_session_title">Sessione attuale</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Verifica o disconnetti questa sessione per una migliore sicurezza e affidabilità.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Verifica la tua sessione attuale per messaggi più sicuri.</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Questa sessione è pronta per i messaggi sicuri.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">La tua sessione attuale è pronta per i messaggi sicuri.</string>
+ <string name="labs_enable_deferred_dm_title">Attiva messaggi diretti differiti</string>
+ <string name="labs_enable_deferred_dm_summary">Crea messaggio diretto solo al primo messaggio</string>
+ <string name="labs_enable_new_app_layout_summary">Un Element semplificato con schede opzionali</string>
+ <string name="labs_enable_new_app_layout_title">Attiva nuova disposizione</string>
+</resources>
\ No newline at end of file
diff --git a/library/ui-strings/src/main/res/values-lt/strings.xml b/library/ui-strings/src/main/res/values-lt/strings.xml
index adfc70c36e..aeba3d53e6 100644
--- a/library/ui-strings/src/main/res/values-lt/strings.xml
+++ b/library/ui-strings/src/main/res/values-lt/strings.xml
@@ -1406,4 +1406,781 @@
<string name="room_permissions_change_room_name">Keisti kambario pavadinimą</string>
<string name="room_permissions_change_history_visibility">Keisti istorijos matomumą</string>
<string name="notice_direct_room_update">%s atnaujino čia.</string>
-</resources>
+ <string name="login_a11y_captcha_container">Atlikite captcha iššūkį</string>
+ <string name="login_a11y_choose_other">Pasirinkti pasirinktinį namų serverį</string>
+ <string name="login_a11y_choose_modular">Pasirinkti Element Matrix Services</string>
+ <string name="login_a11y_choose_matrix_org">Pasirinkti matrix.org</string>
+ <string name="login_signup_cancel_confirmation_content">Jūsų paskyra dar nesukurta. Sustabdyti registracijos procesą\?</string>
+ <string name="login_signup_cancel_confirmation_title">Perspėjimas</string>
+ <string name="login_signup_error_user_in_use">Šis vartotojo vardas yra užimtas</string>
+ <string name="login_signup_submit">Toliau</string>
+ <string name="login_signup_password_hint">Slaptažodis</string>
+ <string name="login_signup_username_hint">Naudotojo vardas</string>
+ <string name="login_signin_username_hint">Naudotojo vardas arba el. pašto adresas</string>
+ <string name="login_msisdn_confirm_submit">Toliau</string>
+ <string name="login_msisdn_confirm_send_again">Siųsti vėl</string>
+ <string name="login_msisdn_confirm_hint">Įvesti kodą</string>
+ <string name="login_msisdn_confirm_notice">Ką tik išsiuntėme kodą į %1$s. Įveskite jį toliau, kad patvirtintumėte, kad tai jūs.</string>
+ <string name="login_set_msisdn_title">Nustatyti telefono numerį</string>
+ <string name="does_not_look_like_valid_email">Neatrodo kaip tinkamas el. pašto adresas</string>
+ <string name="login_set_email_submit">Toliau</string>
+ <string name="login_msisdn_confirm_title">Patvirtinkite telefono numerį</string>
+ <string name="login_set_email_optional_hint">El. pašto adresas (nebūtinas)</string>
+ <string name="login_set_email_mandatory_hint">El. pašto adresas</string>
+ <string name="login_set_msisdn_submit">Toliau</string>
+ <string name="login_set_msisdn_optional_hint">Telefono numeris (nebūtinas)</string>
+ <string name="login_reset_password_success_notice">Jūsų slaptažodis buvo nustatytas iš naujo.</string>
+ <string name="login_reset_password_success_title">Sėkmė!</string>
+ <string name="login_reset_password_mail_confirmation_submit">Patvirtinau savo el. pašto adresą</string>
+ <string name="login_reset_password_mail_confirmation_notice_2">Bakstelėkite nuorodą ir patvirtinkite naująjį slaptažodį. Paspaudę joje esančią nuorodą, spustelėkite žemiau.</string>
+ <string name="login_reset_password_mail_confirmation_notice">Patvirtinimo el. laiškas buvo išsiųstas į %1$s.</string>
+ <string name="login_reset_password_mail_confirmation_title">Patikrinkite savo pašto dėžutę</string>
+ <string name="login_reset_password_error_not_found">Šis el. paštas nėra susietas su jokia paskyra</string>
+ <string name="login_reset_password_warning_submit">Tęsti</string>
+ <string name="login_reset_password_warning_content">Pakeitus slaptažodį bus iš naujo nustatyti visų jūsų sesijų visapusiško šifravimo raktai, todėl užšifruotų pokalbių istorijos nebus galima perskaityti. Prieš iš naujo nustatydami slaptažodį, sukurkite raktų atsarginę kopiją arba eksportuokite kambario raktus iš kitos sesijos.</string>
+ <string name="login_reset_password_warning_title">Perspėjimas!</string>
+ <string name="login_reset_password_password_hint">Naujas slaptažodis</string>
+ <string name="login_reset_password_email_hint">El. paštas</string>
+ <string name="login_reset_password_submit">Toliau</string>
+ <string name="login_reset_password_notice">Į jūsų pašto dėžutę bus išsiųstas patvirtinimo el. laiškas, naujo slaptažodžio nustatymo patvirtinimui.</string>
+ <string name="login_reset_password_on">Iš naujo nustatyti slaptažodį %1$s</string>
+ <string name="login_login_with_email_error">Šis el. paštas nesusijęs su jokia paskyra.</string>
+ <string name="login_registration_not_supported">Programa negali sukurti paskyros šiame namų serveryje.
+\n
+\nAr norite užsiregistruoti naudodami žiniatinklio klientą\?</string>
+ <string name="login_registration_disabled">Atsiprašome, šis serveris nepriima naujų paskyrų.</string>
+ <string name="login_mode_not_supported">Programa negali prisijungti prie šio namų serverio. Namų serveris palaiko šiuos prisijungimo tipus: %1$s.
+\n
+\nAr norite prisijungti naudodami žiniatinklio klientą\?</string>
+ <string name="login_sso_error_message">Įkeliant puslapį įvyko klaida: %1$s (%2$d)</string>
+ <string name="login_server_url_form_common_notice">Įveskite norimo naudoti serverio adresą</string>
+ <string name="login_server_url_form_modular_notice">Įveskite adresą Modular Element arba serverio kurį norite naudoti</string>
+ <string name="login_server_url_form_modular_text">Aukščiausios kokybės talpinimas organizacijoms</string>
+ <string name="login_server_url_form_other_hint">Adresas</string>
+ <string name="login_server_url_form_modular_hint">Element Matrix Services Adresas</string>
+ <string name="login_clear_homeserver_history">Išvalyti istoriją</string>
+ <string name="login_signin_sso">Tęsti su vienkartiniu prisijungimu</string>
+ <string name="login_signin">Prisijungti</string>
+ <string name="login_signup">Registruotis</string>
+ <string name="login_signin_to">Prisijungti prie %1$s</string>
+ <string name="login_connect_to_a_custom_server">Prisijungti prie pasirinktinio serverio</string>
+ <string name="login_connect_to_modular">Prisijungti prie Element Matrix Services</string>
+ <string name="login_connect_to">Prisijungti prie %1$s</string>
+ <string name="login_continue">Tęsti</string>
+ <string name="login_social_sso">vienkartinis prisijungimas</string>
+ <string name="login_social_signin_with">Prisijungti su %s</string>
+ <string name="login_social_signup_with">Užsiregistruoti su %s</string>
+ <string name="login_social_continue_with">Tęsti su %s</string>
+ <string name="login_social_continue">Arba</string>
+ <string name="login_server_other_text">Pasirinktiniai & išplėstiniai nustatymai</string>
+ <string name="login_server_other_title">Kitas</string>
+ <string name="login_server_modular_learn_more">Sužinoti daugiau</string>
+ <string name="login_server_modular_text">Aukščiausios kokybės talpinimas organizacijoms</string>
+ <string name="login_server_matrix_org_text">Nemokamai prisijunkite prie milijonų žmonių didžiausiame viešajame serveryje</string>
+ <string name="login_server_text">Kaip ir el. paštas, paskyros turi vienus namus, nors galite bendrauti su bet kuo</string>
+ <string name="login_server_title">Pasirinkti serverį</string>
+ <string name="login_splash_already_have_account">Aš jau turiu paskyrą</string>
+ <string name="login_splash_create_account">Sukurti paskyrą</string>
+ <string name="login_splash_submit">Pradėkite</string>
+ <string name="login_splash_text3">Išplėskite ir pritaikykite savo patirtį</string>
+ <string name="login_splash_text2">Saugokite pokalbių privatumą naudodami šifravimą</string>
+ <string name="login_splash_text1">Bendraukite su žmonėmis tiesiogiai arba grupėse</string>
+ <string name="login_splash_title">Tai jūsų pokalbis. Priklauso jums.</string>
+ <string name="ftue_personalize_skip_this_step">Praleisti šį žingsnį</string>
+ <string name="ftue_personalize_submit">Išsaugoti ir tęsti</string>
+ <string name="ftue_personalize_complete_subtitle">Bet kada eikite į nustatymus norint atnaujinti savo profilį</string>
+ <string name="ftue_personalize_complete_title">Atrodo gerai!</string>
+ <string name="ftue_personalize_lets_go">Pirmyn</string>
+ <string name="ftue_profile_picture_subtitle">Laikas prie vardo pridėti veidą</string>
+ <string name="ftue_profile_picture_title">Pridėti profilio nuotrauką</string>
+ <string name="ftue_display_name_entry_footer">Jūs tai galite pakeisti vėliau</string>
+ <string name="ftue_display_name_entry_title">Rodomas vardas</string>
+ <string name="ftue_display_name_title">Pasirinkite rodomą vardą</string>
+ <string name="ftue_auth_login_username_entry">Vartotojo vardas / el. paštas / telefonas</string>
+ <string name="ftue_auth_captcha_title">Ar esate žmogus\?</string>
+ <string name="ftue_auth_password_reset_email_confirmation_subtitle">Vykdykite nurodymus, išsiųstus adresu %s</string>
+ <string name="ftue_auth_forgot_password">Pamiršau slaptažodį</string>
+ <string name="ftue_auth_password_reset_confirmation">Slaptažodžio nustatymas iš naujo</string>
+ <string name="ftue_auth_email_resend_email">Iš naujo siųsti el. laišką</string>
+ <string name="ftue_auth_email_verification_footer">Negavote el. laiško\?</string>
+ <string name="ftue_auth_email_verification_subtitle">Vykdykite nurodymus, išsiųstus adresu %s</string>
+ <string name="ftue_auth_email_verification_title">Patvirtinkite savo el. pašto adresą</string>
+ <string name="ftue_auth_phone_confirmation_resend_code">Iš naujo siųsti kodą</string>
+ <string name="ftue_auth_phone_confirmation_subtitle">Kodas buvo išsiųstas į %s</string>
+ <string name="ftue_auth_phone_confirmation_title">Patvirtinkite savo telefono numerį</string>
+ <string name="ftue_auth_sign_out_all_devices">Atjungti visus prietaisus</string>
+ <string name="ftue_auth_reset_password">Iš naujo nustatyti slaptažodį</string>
+ <string name="ftue_auth_use_case_option_one">Draugai ir šeima</string>
+ <string name="ftue_auth_use_case_subtitle">Padėsime jums užmegzti ryšį</string>
+ <string name="ftue_auth_use_case_title">Su kuo daugiausiai bendrausite\?</string>
+ <string name="ftue_auth_carousel_workplace_body">${app_name} taip pat puikiai tinka darbo vietoje. Ja pasitiki saugiausios pasaulio organizacijos.</string>
+ <string name="ftue_auth_carousel_encrypted_body">Visapusiškai užšifruota ir nereikia telefono numerio. Jokių reklamų ar duomenų rinkimo.</string>
+ <string name="ftue_auth_carousel_control_body">Pasirinkite, kur bus saugomi jūsų pokalbiai, taip suteikdami jums galimybę kontroliuoti ir būti nepriklausomiems. Sujungta naudojant Matrix.</string>
+ <string name="ftue_auth_carousel_secure_body">Saugus ir nepriklausomas bendravimas, suteikiantis tiek pat privatumo, kiek ir pokalbis akis į akį jūsų namuose.</string>
+ <string name="error_terms_not_accepted">Bandykite dar kartą, kai sutiksite su savo namų serverio nuostatomis ir sąlygomis.</string>
+ <string name="labs_allow_extended_logging_summary">Išsamūs žurnalai padės kūrėjams, nes siųsdami piktą purtymą pateiksite daugiau žurnalų. Net ir įjungus šią funkciją, programa nerenka žinučių turinio ar kitų privačių duomenų.</string>
+ <string name="labs_allow_extended_logging">Įjungti išsamius žurnalus.</string>
+ <string name="settings_agree_to_terms">Sutikite su tapatybės serverio (%s) paslaugų teikimo sąlygomis, kad galėtumėte būti atrandami pagal el. pašto adresą arba telefono numerį.</string>
+ <string name="settings_discovery_disconnect_with_bound_pid">Šiuo metu bendrinate el. pašto adresus arba telefono numerius tapatybės serveryje %1$s. Norėdami nustoti juos bendrinti, turėsite iš naujo prisijungti prie %2$s.</string>
+ <string name="settings_text_message_sent">Tekstinė žinutė buvo išsiųsta adresu %s. Įveskite joje esantį patvirtinimo kodą.</string>
+ <string name="settings_discovery_no_terms">Pasirinktame tapatybės serveryje nėra jokių paslaugų teikimo sąlygų. Tęskite tik tuo atveju, jei pasitikite paslaugos savininku</string>
+ <string name="settings_discovery_no_terms_title">Tapatybės serveris neturi paslaugų teikimo sąlygų</string>
+ <string name="settings_discovery_please_enter_server">Įveskite tapatybės serverio url</string>
+ <string name="settings_discovery_bad_identity_server">Nepavyko prisijungti prie tapatybės serverio</string>
+ <string name="settings_discovery_enter_identity_server">Įveskite tapatybės serverio URL</string>
+ <string name="identity_server_consent_dialog_content_question">Ar sutinkate siųsti šią informaciją\?</string>
+ <string name="identity_server_consent_dialog_content_3">Jei norite atrasti esamus kontaktus, į tapatybės serverį reikia nusiųsti kontaktinę informaciją (el. paštus ir telefono numerius). Prieš išsiunčiant duomenis, siekiant užtikrinti privatumą, juos sutriname.</string>
+ <string name="give_feedback_threads">Pateikti atsiliepimą</string>
+ <string name="give_feedback" tools:ignore="UnusedResources">Pateikti atsiliepimą</string>
+ <string name="feedback_failed">Atsiliepimo nepavyko išsiųsti (%s)</string>
+ <string name="feedback_sent">Ačiū, jūsų atsiliepimas sėkmingai išsiųstas</string>
+ <string name="you_may_contact_me">Jei turite papildomų klausimų, galite susisiekti su manimi</string>
+ <string name="feedback">Atsiliepimas</string>
+ <string name="beta_title_bottom_sheet_action">BETA</string>
+ <string name="send_suggestion_failed">Pasiūlymo nepavyko išsiųsti (%s)</string>
+ <string name="send_suggestion_sent">Ačiū, pasiūlymas sėkmingai išsiųstas</string>
+ <string name="send_suggestion_report_placeholder">Aprašykite savo pasiūlymą čia</string>
+ <string name="send_suggestion_content">Žemiau parašykite savo pasiūlymą.</string>
+ <string name="send_suggestion">Pateikti pasiūlymą</string>
+ <string name="preference_versions">Versijos</string>
+ <string name="preference_help_summary">Gaukite pagalbos naudojant ${app_name}</string>
+ <string name="preference_help_title">Pagalba ir parama</string>
+ <string name="preference_help">Pagalba</string>
+ <string name="preference_root_legals">Teisės aktai</string>
+ <string name="preference_root_help_about">Pagalba & Apie</string>
+ <string name="preference_voice_and_video">Balsas & Vaizdas</string>
+ <string name="push_gateway_item_profile_tag">Profilio žyma:</string>
+ <string name="push_gateway_item_format">Formatas:</string>
+ <string name="push_gateway_item_url">Url:</string>
+ <string name="push_gateway_item_device_name">session_name:</string>
+ <string name="push_gateway_item_app_display_name">app_display_name:</string>
+ <string name="push_gateway_item_push_key">push_key:</string>
+ <string name="push_gateway_item_app_id">app_id:</string>
+ <string name="navigate_to_thread_when_already_in_the_thread">Jūs jau žiūrite šią temą!</string>
+ <string name="navigate_to_room_when_already_in_the_room">Jūs jau žiūrite šį kambarį!</string>
+ <string name="import_e2e_keys_from_file">Importuoti šifravimo raktus iš failo \"%1$s\".</string>
+ <string name="keys_backup_unable_to_get_keys_backup_data">Įvyko klaida gaunant raktų atsarginės kopijos duomenis</string>
+ <string name="keys_backup_unable_to_get_trust_info">Įvyko klaida gaunant pasitikėjimo informaciją</string>
+ <string name="create_room_federation_error">Kambarys sukurtas, tačiau kai kurie kvietimai nebuvo išsiųsti dėl šios priežasties:
+\n
+\n%s</string>
+ <string name="create_room_public_description">Kiekvienas galės prisijungti prie šio kambario</string>
+ <string name="create_room_public_title">Viešas</string>
+ <string name="create_room_topic_hint">Tema</string>
+ <string name="create_room_topic_section">Kambario tema (nebūtina)</string>
+ <string name="create_room_name_hint">Pavadinimas</string>
+ <string name="create_room_name_section">Kambario pavadinimas</string>
+ <string name="create_room_action_go">Eiti</string>
+ <string name="create_room_action_create">SUKURTI</string>
+ <string name="fab_menu_create_chat">Tiesioginės žinutės</string>
+ <string name="fab_menu_create_room">Kambariai</string>
+ <string name="room_preview_no_preview_join">Šio kambario negalima peržiūrėti. Ar norite prie jo prisijungti\?</string>
+ <string name="room_preview_not_found">Šiuo metu į šį kambarį patekti negalima.
+\nPabandykite vėliau arba paprašykite kambario admino patikrinti, ar turite prieigą.</string>
+ <string name="room_preview_no_preview">Šio kambario negalima peržiūrėti</string>
+ <string name="updating_your_data">Atnaujinami jūsų duomenys…</string>
+ <string name="please_wait">Prašome palaukti…</string>
+ <string name="change_room_directory_network">Keisti tinklą</string>
+ <string name="error_no_network">Tinklo nėra. Patikrinkite interneto ryšį.</string>
+ <string name="create_new_room">Sukurti naują kambarį</string>
+ <string name="malformed_message">Neteisingai suformuotas įvykis, negalima rodyti</string>
+ <string name="event_redacted_by_admin_reason">Įvykis moderuotas kambario admino</string>
+ <string name="event_redacted_by_user_reason">Naudotojo ištrintas įvykis</string>
+ <string name="event_redacted">Žinutė pašalinta</string>
+ <string name="reactions">Reakcijos</string>
+ <string name="message_view_reaction">Peržiūrėti reakcijas</string>
+ <string name="message_add_reaction">Pridėti reakciją</string>
+ <string name="title_activity_emoji_reaction_picker">Reakcijos</string>
+ <string name="room_list_filter_people">Žmonės</string>
+ <string name="room_list_filter_favourites">Parankiniai</string>
+ <string name="room_list_filter_unreads">Neperskaityti</string>
+ <string name="room_list_filter_all">Visi</string>
+ <string name="room_list_rooms_empty_body">Čia bus rodomi jūsų kambariai. Bakstelėkite \"+\" apačioje dešinėje, kad rastumėte esamus kambarius arba pradėtumėte kurti savo.</string>
+ <string name="room_list_rooms_empty_title">Kambariai</string>
+ <string name="room_list_people_empty_body">Jūsų tiesioginių žinučių pokalbiai bus rodomi čia. Bakstelėkite \"+\" apačioje dešinėje, kad pradėtumėte keletą.</string>
+ <string name="room_list_people_empty_title">Pokalbiai</string>
+ <string name="room_list_catchup_empty_body">Neturite daugiau neperskaitytų žinučių</string>
+ <string name="room_list_catchup_empty_title">Jūs viską pasivijote!</string>
+ <string name="invited_by">Pakvietė %s</string>
+ <string name="send_you_invite">Išsiuntė jums kvietimą</string>
+ <string name="global_retry">Pakartoti</string>
+ <string name="view_in_room">Peržiūrėti kambaryje</string>
+ <string name="reply_in_thread">Atsakyti temoje</string>
+ <string name="reply">Atsakyti</string>
+ <string name="edit">Redaguoti</string>
+ <string name="error_user_already_logged_in">Atrodo, kad bandote prisijungti prie kito namų serverio. Ar norite atsijungti\?</string>
+ <string name="identity_server_not_defined">Jūs nenaudojate jokio tapatybės serverio</string>
+ <string name="sas_error_unknown">Nežinoma klaida</string>
+ <string name="sas_incoming_request_notif_content">%s nori patvirtinti jūsų sesiją</string>
+ <string name="sas_incoming_request_notif_title">Patvirtinimo užklausa</string>
+ <string name="sas_got_it">Supratau</string>
+ <string name="sas_verified">Patvirtinta!</string>
+ <string name="keys_backup_info_title_signature">Parašas</string>
+ <string name="keys_backup_info_title_algorithm">Algoritmas</string>
+ <string name="keys_backup_info_title_version">Versija</string>
+ <plurals name="keys_backup_info_keys_backing_up">
+ <item quantity="one">Kuriama atsarginė %d rakto kopija…</item>
+ <item quantity="few">Kuriama atsarginė %d raktų kopija…</item>
+ <item quantity="other">Kuriama atsarginė %d raktų kopija…</item>
+ </plurals>
+ <string name="keys_backup_info_keys_all_backup_up">Visų raktų atsarginė kopija sukurta</string>
+ <string name="secure_backup_setup">Nustatyti saugią atsarginę kopiją</string>
+ <string name="keys_backup_banner_in_progress">Kuriama raktų atsarginė kopija. Tai gali užtrukti kelias minutes…</string>
+ <string name="keys_backup_banner_update_line2">Valdyti raktų atsarginėje kopijoje</string>
+ <string name="keys_backup_banner_update_line1">Nauji saugių žinučių raktai</string>
+ <string name="keys_backup_banner_recover_line2">Naudoti raktų atsarginę kopiją</string>
+ <string name="keys_backup_banner_recover_line1">Niekada nepraraskite užšifruotų žinučių</string>
+ <string name="secure_backup_banner_setup_line2">Apsisaugokite nuo užšifruotų žinučių ir duomenų praradimo</string>
+ <string name="secure_backup_banner_setup_line1">Saugi atsarginė kopija</string>
+ <string name="notification_off">Išjungta</string>
+ <string name="command_description_clear_scalar_token">Kad ištaisyti Matrix programėlių valdymą</string>
+ <string name="command_description_markdown">Įj./Išj. markdown</string>
+ <string name="key_share_request">Prašymas dalytis raktais</string>
+ <string name="timeline_error_room_not_found">Atsiprašome, šis kambarys nerastas.
+\nPrašome bandyti vėliau.%s</string>
+ <string name="widget_integration_review_terms">Jei norite tęsti, turite sutikti su šios paslaugos sąlygomis.</string>
+ <string name="room_no_active_widgets">Nėra aktyvių valdiklių</string>
+ <string name="widget_integration_missing_user_id">Užklausoje trūksta user_id.</string>
+ <string name="widget_integration_missing_room_id">Užklausoje trūksta room_id.</string>
+ <string name="widget_integration_positive_power_level">Galios lygis turi būti teigiamas sveikasis skaičius.</string>
+ <string name="widget_integration_failed_to_send_request">Nepavyko išsiųsti užklausos.</string>
+ <string name="widget_integration_unable_to_create">Nepavyko sukurti valdiklio.</string>
+ <string name="room_widget_webview_read_protected_media">Skaityti DRM apsaugotą mediją</string>
+ <string name="room_widget_resource_permission_title">Šis valdiklis nori naudoti šiuos išteklius:</string>
+ <string name="jitsi_leave_conf_to_join_another_one_content">Palikti dabartinę konferenciją ir pereiti į kitą\?</string>
+ <string name="error_jitsi_join_conf">Atsiprašome, bandant prisijungti prie konferencijos įvyko klaida</string>
+ <string name="error_jitsi_not_supported_on_old_device">Atsiprašome, konferenciniai skambučiai su Jitsi nepalaikomi senuose įrenginiuose (įrenginiuose su žemesne nei 6.0 Android OS)</string>
+ <string name="room_widget_permission_widget_id">Valdiklio ID</string>
+ <string name="room_widget_permission_theme">Jūsų tema</string>
+ <string name="room_widget_permission_user_id">Jūsų naudotojo ID</string>
+ <string name="room_widget_permission_avatar_url">Jūsų avataro URL</string>
+ <string name="room_widget_permission_display_name">Jūsų rodomas vardas</string>
+ <string name="room_widget_revoke_access">Atšaukti prieigą man</string>
+ <string name="room_widget_open_in_browser">Atidaryti naršyklėje</string>
+ <string name="room_widget_reload">Iš naujo įkelti valdiklį</string>
+ <string name="room_widget_failed_to_load">Nepavyko įkelti valdiklio.
+\n%s</string>
+ <string name="room_widget_permission_shared_info_title">Naudojant jį duomenys gali būti bendrinami su %s:</string>
+ <string name="room_widget_permission_webview_shared_info_title">Naudojant jį gali būti nustatyti slapukai ir bendrinami duomenys su %s:</string>
+ <string name="room_widget_permission_added_by">Šį valdiklį pridėjo:</string>
+ <string name="room_widget_permission_title">Įkelti valdiklį</string>
+ <string name="room_widget_activity_title">Valdiklis</string>
+ <string name="active_widgets_title">Aktyvūs valdikliai</string>
+ <string name="active_widget_view_action">PERŽIŪRĖTI</string>
+ <plurals name="active_widgets">
+ <item quantity="one">%d aktyvus valdiklis</item>
+ <item quantity="few">%d aktyvūs valdikliai</item>
+ <item quantity="other">%d aktyvių valdiklių</item>
+ </plurals>
+ <string name="widget_delete_message_confirmation">Ar tikrai norite ištrinti valdiklį iš šio kambario\?</string>
+ <string name="huge">Milžiniškas</string>
+ <string name="largest">Didžiausias</string>
+ <string name="larger">Didesnis</string>
+ <string name="large">Didelis</string>
+ <string name="normal">Vidutinis</string>
+ <string name="small">Mažas</string>
+ <string name="tiny">Mažytis</string>
+ <string name="font_size">Šrifto dydis</string>
+ <string name="font_size_use_system">Naudoti sistemos numatytąjį</string>
+ <string name="font_size_section_manually">Pasirinkti rankiniu būdu</string>
+ <string name="font_size_section_auto">Nustatyti automatiškai</string>
+ <string name="font_size_title">Pasirinkti šrifto dydį</string>
+ <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+ <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+ <string name="notification_inline_reply_failed">** Nepavyko išsiųsti - atidarykite kambarį</string>
+ <string name="notification_sender_me">Aš</string>
+ <string name="notification_new_invitation">Naujas pakvietimas</string>
+ <string name="notification_new_messages">Naujos žinutės</string>
+ <string name="notification_unknown_room_name">Kambarys</string>
+ <string name="notification_unknown_new_event">Naujas įvykis</string>
+ <string name="notification_unread_notified_messages_and_invitation">%1$s ir %2$s</string>
+ <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s esantys %2$s ir %3$s</string>
+ <string name="notification_unread_notified_messages_in_room">%1$s esantys %2$s</string>
+ <plurals name="notification_compat_summary_title">
+ <item quantity="one">%d pranešimas</item>
+ <item quantity="few">%d pranešimai</item>
+ <item quantity="other">%d pranešimų</item>
+ </plurals>
+ <plurals name="notification_compat_summary_line_for_room">
+ <item quantity="one">%1$s: %2$d žinutė</item>
+ <item quantity="few">%1$s: %2$d žinutės</item>
+ <item quantity="other">%1$s: %2$d žinučių</item>
+ </plurals>
+ <plurals name="notification_invitations">
+ <item quantity="one">%d pakvietimas</item>
+ <item quantity="few">%d pakvietimai</item>
+ <item quantity="other">%d pakvietimų</item>
+ </plurals>
+ <plurals name="notification_unread_notified_messages_in_room_rooms">
+ <item quantity="one">%d kambarys</item>
+ <item quantity="few">%d kambariai</item>
+ <item quantity="other">%d kambarių</item>
+ </plurals>
+ <plurals name="notification_unread_notified_messages">
+ <item quantity="one">%d neperskaityta pranešta žinutė</item>
+ <item quantity="few">%d neperskaitytos praneštos žinutės</item>
+ <item quantity="other">%d neperskaitytų praneštų žinučių</item>
+ </plurals>
+ <string name="directory_add_a_new_server_error_already_added">Šis serveris jau yra sąraše</string>
+ <string name="directory_add_a_new_server_error">Negalima rasti šio serverio arba jo kambarių sąrašo</string>
+ <string name="directory_add_a_new_server_prompt">Įveskite naujo serverio, kurį norite patyrinėti, pavadinimą.</string>
+ <string name="directory_add_a_new_server">Pridėti naują serverį</string>
+ <string name="directory_your_server">Jūsų serveris</string>
+ <string name="directory_server_native_rooms">Visi vietiniai %s kambariai</string>
+ <string name="directory_server_all_rooms_on_server">Visi kambariai %s serveryje</string>
+ <string name="directory_server_placeholder">Serverio pavadinimas</string>
+ <string name="select_room_directory">Pasirinkti kambarių katalogą</string>
+ <string name="encryption_information_verify_device_warning2">Jei jie nesutampa, gali kilti pavojus jūsų komunikacijos saugumui.</string>
+ <string name="encryption_information_verify">Patvirtinti</string>
+ <string name="encryption_information_unknown_ip">nežinomas ip</string>
+ <string name="encryption_information_verified">Patvirtinta</string>
+ <string name="encryption_information_not_verified">Nepatvirtinta</string>
+ <plurals name="encryption_import_room_keys_success">
+ <item quantity="one">%1$d/%2$d raktas importuotas sėkmingai.</item>
+ <item quantity="few">%1$d/%2$d raktai importuoti sėkmingai.</item>
+ <item quantity="other">%1$d/%2$d raktų importuota sėkmingai.</item>
+ </plurals>
+ <string name="encryption_never_send_to_unverified_devices_summary">Niekada nesiųsti užšifruotų žinučių į nepatvirtintas sesijas iš šios sesijos.</string>
+ <string name="encryption_never_send_to_unverified_devices_title">Šifruoti tik į patvirtintas sesijas</string>
+ <string name="encryption_import_import">Importuoti</string>
+ <string name="encryption_import_room_keys_summary">Importuoti raktus iš vietinio failo</string>
+ <string name="encryption_import_room_keys">Importuoti kambarių raktus</string>
+ <string name="encryption_import_e2e_room_keys">Importuoti šifruotų kambarių raktus</string>
+ <string name="encryption_message_recovery">Užšifruotų žinučių atkūrimas</string>
+ <string name="encryption_exported_successfully">Raktai sėkmingai eksportuoti</string>
+ <string name="encryption_export_notice">Sukurkite slaptafrazę eksportuojamiems raktams užšifruoti. Norėdami importuoti raktus, turėsite įvesti tą pačią slaptafrazę.</string>
+ <string name="encryption_export_export">Eksportuoti</string>
+ <string name="encryption_export_room_keys_summary">Eksportuoti raktus į vietinį failą</string>
+ <string name="encryption_export_room_keys">Eksportuoti kambarių raktus</string>
+ <string name="encryption_export_e2e_room_keys">Eksportuoti šifruotų kambarių raktus</string>
+ <string name="encryption_information_device_key">Sesijos raktas</string>
+ <string name="encryption_information_device_name">Viešas pavadinimas</string>
+ <string name="encryption_information_decryption_error">Iššifravimo klaida</string>
+ <string name="decide_who_can_find_and_join">Nuspręskite, kas gali rasti ir prisijungti prie šio kambario.</string>
+ <string name="room_alias_publish_to_directory_error">Nepavyko gauti dabartinio kambarių katalogo matomumo (%1$s).</string>
+ <string name="room_alias_publish_to_directory">Paskelbti šį kambarį viešai %1$s kambarių kataloge\?</string>
+ <string name="room_alias_action_unpublish">Panaikinti šio adreso skelbimą</string>
+ <string name="room_alias_action_publish">Paskelbti šį adresą</string>
+ <string name="room_alias_local_address_add">Pridėti vietinį adresą</string>
+ <string name="room_alias_local_address_empty">Šis kambarys neturi vietinių adresų</string>
+ <string name="room_alias_local_address_subtitle">Nustatykite šio kambario adresus, kad naudotojai galėtų rasti šį kambarį per jūsų namų serverį (%1$s)</string>
+ <string name="room_alias_local_address_title">Vietiniai adresai</string>
+ <string name="room_alias_address_hint">Naujas skelbiamas adresas (pvz., #pseudonimas:serveris)</string>
+ <string name="room_alias_address_empty">Kitų paskelbtų adresų dar nėra.</string>
+ <string name="room_alias_address_empty_can_add">Kitų paskelbtų adresų dar nėra, pridėkite juos žemiau.</string>
+ <string name="room_alias_delete_confirmation">Ištrinti adresą \"%1$s\"\?</string>
+ <string name="room_alias_unpublish_confirmation">Panaikinti adreso \"%1$s\" skelbimą\?</string>
+ <string name="room_alias_published_alias_add_manually_submit">Paskelbti</string>
+ <string name="room_alias_published_alias_add_manually">Paskelbti naują adresą rankiniu būdu</string>
+ <string name="room_alias_published_other">Kiti paskelbti adresai:</string>
+ <string name="room_alias_published_alias_main">Tai yra pagrindinis adresas</string>
+ <string name="room_alias_published_alias_subtitle">Paskelbtus adresus gali naudoti bet kas bet kuriame serveryje, prisijungimui prie jūsų kambario. Norint paskelbti adresą, pirmiausia nustatykite jį kaip vietinį adresą.</string>
+ <string name="room_alias_published_alias_title">Paskelbti adresai</string>
+ <string name="settings_troubleshoot_test_token_registration_title">Žetono registracija</string>
+ <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Pridėti paskyrą</string>
+ <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nŠi klaida yra nekontroliuojama ${app_name}. Telefone nėra Google paskyros. Atidarykite paskyrų tvarkytuvę ir pridėkite Google paskyrą.</string>
+ <string name="encryption_misconfigured">Šifravimas neteisingai sukonfigūruotas</string>
+ <string name="encryption_not_enabled">Šifravimas nėra įjungtas</string>
+ <string name="direct_room_encryption_enabled_tile_description_future">Šiame pokalbyje žinutės bus visapusiškai užšifruojamos.</string>
+ <string name="direct_room_encryption_enabled_tile_description">Šiame pokalbyje žinutės yra visapusiškai užšifruotos.</string>
+ <string name="encryption_enabled_tile_description">Šiame kambaryje žinutės yra visapusiškai užšifruotos. Sužinokite daugiau ir patvirtinkite naudotojus jų profilyje.</string>
+ <string name="encryption_enabled">Šifravimas įjungtas</string>
+ <string name="encryption_unknown_algorithm_tile_description">Šiame kambaryje naudojamas šifravimas nepalaikomas</string>
+ <string name="qr_code_scanned_verif_waiting_notice">Jau beveik! Laukiama patvirtinimo…</string>
+ <string name="qr_code_scanned_self_verif_notice">Jau beveik! Ar kitas prietaisas rodo varnelę\?</string>
+ <string name="topic_prefix">"Tema: "</string>
+ <string name="add_a_topic_link_text">Pridėkite temą</string>
+ <string name="send_your_first_msg_to_invite">Siųskite pirmąją žinutę kad pakviestumėte %s į pokalbį</string>
+ <string name="this_is_the_beginning_of_dm">Tai yra jūsų tiesioginių žinučių su %s istorijos pradžia.</string>
+ <string name="this_is_the_beginning_of_room_no_name">Tai šio pokalbio pradžia.</string>
+ <string name="this_is_the_beginning_of_room">Tai yra %s pradžia.</string>
+ <string name="direct_room_created_summary_item_by_you">Jūs prisijungėte.</string>
+ <string name="direct_room_created_summary_item">%s prisijungė.</string>
+ <string name="room_created_summary_item_by_you">Sukūrėte ir sukonfigūravote kambarį.</string>
+ <string name="room_created_summary_item">%s sukūrė ir sukonfigūravo kambarį.</string>
+ <string name="error_failed_to_import_keys">Nepavyko importuoti raktų</string>
+ <string name="qr_code_scanned_verif_waiting">Laukiama %s…</string>
+ <string name="auth_invalid_login_deactivated_account">Ši paskyra buvo deaktyvuota.</string>
+ <string name="room_message_placeholder">Žinutė…</string>
+ <string name="bootstrap_progress_checking_backup">Tikrinamas atsarginės kopijos raktas</string>
+ <string name="recovery_key_empty_error_message">Įveskite atkūrimo raktą</string>
+ <string name="bootstrap_invalid_recovery_key">Tai netinkamas atkūrimo raktas</string>
+ <string name="use_file">Naudoti failą</string>
+ <string name="bootstrap_enter_recovery">Norėdami tęsti, įveskite savo %s</string>
+ <string name="security_prompt_text">Patvirtinkite save ir kitus, kad pokalbiai būtų saugūs</string>
+ <string name="upgrade_security">Galimas šifravimo patobulinimas</string>
+ <string name="bootstrap_progress_checking_backup_with_info">Tikrinamas atsarginės kopijos raktas (%s)</string>
+ <string name="settings_troubleshoot_test_token_registration_success">FCM žetonas sėkmingai užregistruotas namų serveryje.</string>
+ <string name="terms_description_for_integration_manager">Naudoti botus, tiltus, valdiklius ir lipdukų paketus</string>
+ <string name="change_identity_server">Keisti tapatybės serverį</string>
+ <string name="settings_discovery_consent_title">Siųsti el. paštus ir telefono numerius</string>
+ <string name="add_identity_server">Konfigūruoti tapatybės serverį</string>
+ <string name="disconnect_identity_server">Atjungti tapatybės serverį</string>
+ <string name="identity_server">Tapatybės serveris</string>
+ <string name="settings_text_message_sent_wrong_code">Patvirtinimo kodas neteisingas.</string>
+ <string name="settings_text_message_sent_hint">Kodas</string>
+ <string name="error_network_timeout">Atrodo, kad serveris neatsako per ilgai, tai gali būti dėl prasto ryšio arba serverio klaidos. Pabandykite dar kartą po kurio laiko.</string>
+ <string name="one_user_read">%s perskaitė</string>
+ <string name="two_users_read">%1$s ir %2$s perskaitė</string>
+ <string name="three_users_read">%1$s, %2$s ir %3$s perskaitė</string>
+ <plurals name="two_and_some_others_read">
+ <item quantity="one">%1$s, %2$s ir %3$d kitas perskaitė</item>
+ <item quantity="few">%1$s, %2$s ir %3$d kiti perskaitė</item>
+ <item quantity="other">%1$s, %2$s ir %3$d kitų perskaitė</item>
+ </plurals>
+ <string name="a11y_jump_to_bottom">Peršokti į apačią</string>
+ <string name="a11y_close_keys_backup_banner">Uždaryti raktų atsarginės kopijos antraštę</string>
+ <string name="a11y_create_room">Sukurti naują kambarį</string>
+ <string name="a11y_create_message">Sukurti naują pokalbį arba kambarį</string>
+ <string name="a11y_create_direct_message">Sukurti naują tiesioginį pokalbį</string>
+ <string name="a11y_create_menu_close">Uždaryti kambario kūrimo meniu…</string>
+ <string name="a11y_create_menu_open">Atidaryti kambario kūrimo meniu</string>
+ <string name="a11y_open_drawer">Atidaryti navigacijos stalčių</string>
+ <string name="send_attachment">Siųsti priedą</string>
+ <plurals name="fallback_users_read">
+ <item quantity="one">%d naudotojas perskaitė</item>
+ <item quantity="few">%d naudotojai perskaitė</item>
+ <item quantity="other">%d naudotojų perskaitė</item>
+ </plurals>
+ <string name="error_file_too_big_simple">Failas yra per didelis, kad jį būtų galima įkelti.</string>
+ <string name="attachment_type_dialog_title">Pridėti paveikslėlį iš</string>
+ <string name="content_reported_as_inappropriate_content">Šis turinys buvo praneštas kaip nepadorus.
+\n
+\nJei nenorite matyti daugiau šio naudotojo turinio, galite jį ignoruoti kad paslėpti jo žinutes.</string>
+ <string name="content_reported_as_inappropriate_title">Pranešta kaip nepadorus turinys</string>
+ <string name="content_reported_as_spam_content">Apie šį turinį buvo pranešta kaip apie šlamštą.
+\n
+\nJei nenorite matyti daugiau šio naudotojo turinio, galite jį ignoruoti kad paslėpti jo žinutes.</string>
+ <string name="content_reported_as_spam_title">Pranešta kaip šlamštas</string>
+ <string name="content_reported_content">Buvo pranešta apie šį turinį.
+\n
+\nJei nenorite matyti daugiau šio naudotojo turinio, galite jį ignoruoti kad paslėpti jo žinutes.</string>
+ <string name="content_reported_title">Turinys praneštas</string>
+ <string name="block_user">IGNORUOTI NAUDOTOJĄ</string>
+ <string name="report_content_custom_submit">PRANEŠTI</string>
+ <string name="report_content_custom_hint">Pranešimo apie šį turinį priežastis</string>
+ <string name="report_content_custom_title">Pranešti apie šį turinį</string>
+ <string name="report_content_custom">Pasirinktinis pranešimas…</string>
+ <string name="report_content_inappropriate">Tai nepadoru</string>
+ <string name="report_content_spam">Tai šlamštas</string>
+ <string name="uploads_files_no_result">Šiame kambaryje nėra failų</string>
+ <string name="uploads_files_subtitle">%1$s %2$s</string>
+ <string name="uploads_files_title">FAILAI</string>
+ <string name="uploads_media_no_result">Šiame kambaryje nėra medijos</string>
+ <string name="uploads_media_title">MEDIJA</string>
+ <string name="attachment_viewer_item_x_of_y">%1$d iš %2$d</string>
+ <string name="error_handling_incoming_share">Nepavyko tvarkyti bendrinimo duomenų</string>
+ <string name="rotate_and_crop_screen_title">Pasukti ir apkarpyti</string>
+ <string name="attachment_type_location">Vietovė</string>
+ <string name="attachment_type_poll">Apklausa</string>
+ <string name="attachment_type_sticker">Lipdukas</string>
+ <string name="attachment_type_gallery">Galerija</string>
+ <string name="attachment_type_camera">Kamera</string>
+ <string name="attachment_type_contact">Kontaktas</string>
+ <string name="attachment_type_file">Failas</string>
+ <string name="reaction_search_type_hint">Įveskite raktažodžius, reakcijos radimui.</string>
+ <string name="spoiler">Spoileris</string>
+ <string name="command_description_spoiler">Siunčia duotą žinutę kaip spoilerį</string>
+ <string name="notice_member_no_changes_by_you">Nepadarėte jokių pakeitimų</string>
+ <string name="notice_member_no_changes">%1$s nepadarė jokių pakeitimų</string>
+ <string name="room_join_rules_invite">%1$s padarė šį kambarį tik pakviestiems.</string>
+ <string name="room_join_rules_public_by_you">Paviešinote kambarį visiems, kurie žino nuorodą.</string>
+ <string name="room_join_rules_public">%1$s paviešino kambarį visiems, kurie žino nuorodą.</string>
+ <string name="help_long_click_on_room_for_more_options">Ilgai spauskite ant kambario, kad pamatytumėte daugiau parinkčių</string>
+ <string name="no_ignored_users">Jūs neignoruojate jokių naudotojų</string>
+ <string name="room_list_quick_actions_low_priority_remove">Pašalinti iš žemo prioriteto</string>
+ <string name="room_list_quick_actions_low_priority_add">Pridėti prie žemo prioriteto</string>
+ <string name="room_list_quick_actions_favorite_remove">Pašalinti iš parankinių</string>
+ <string name="room_list_quick_actions_favorite_add">Pridėti prie parankinių</string>
+ <string name="message_ignore_user">Ignoruoti naudotoją</string>
+ <string name="room_list_quick_actions_notifications_all_noisy">Visos žinutės (triukšmingas)</string>
+ <string name="room_list_quick_actions_notifications_mute">Nutildyti</string>
+ <string name="room_list_quick_actions_notifications_mentions">Tik paminėjimai</string>
+ <string name="room_list_quick_actions_notifications_all">Visos žinutės</string>
+ <string name="room_list_quick_actions_settings">Nustatymai</string>
+ <string name="room_list_quick_actions_room_settings">Kambario nustatymai</string>
+ <string name="room_list_quick_actions_leave">Išeiti iš kambario</string>
+ <string name="direct_room_join_rules_invite_by_you">Padarėte šitai tik pakviestiems.</string>
+ <string name="direct_room_join_rules_invite">%1$s padarė šitai tik pakviestiems.</string>
+ <string name="room_join_rules_invite_by_you">Padarėte šį kambarį tik pakviestiems.</string>
+ <string name="ftue_auth_carousel_workplace_title">Žinučių siuntimas jūsų komandai.</string>
+ <string name="ftue_auth_carousel_encrypted_title">Saugus žinučių siuntimas.</string>
+ <string name="ftue_auth_carousel_control_title">Jūs viską kontroliuojate.</string>
+ <string name="ftue_auth_carousel_secure_title">Turėkite savo pokalbius.</string>
+ <string name="timeline_unread_messages">Neperskaitytos žinutės</string>
+ <string name="ftue_auth_use_case_skip">Dar nesate tikri\? %s</string>
+ <string name="ftue_auth_use_case_option_three">Bendruomenės</string>
+ <string name="ftue_auth_use_case_option_two">Komandos</string>
+ <string name="ftue_auth_create_account_edit_server_selection">Redaguoti</string>
+ <string name="ftue_auth_create_account_sso_section_header">Arba</string>
+ <string name="ftue_auth_sign_in_choose_server_header">Kur laikomi jūsų pokalbiai</string>
+ <string name="ftue_auth_create_account_choose_server_header">Kur bus laikomi jūsų pokalbiai</string>
+ <string name="ftue_auth_create_account_password_entry_footer">Turi būti ne mažiau kaip 8 simboliai</string>
+ <string name="ftue_auth_create_account_username_entry_footer">Kiti gali jus atrasti %s</string>
+ <string name="ftue_auth_create_account_title">Sukurti savo paskyrą</string>
+ <string name="ftue_account_created_subtitle">Jūsų paskyra %s buvo sukurta</string>
+ <string name="ftue_account_created_congratulations_title">Sveikiname!</string>
+ <string name="ftue_account_created_take_me_home">Pasiimkite mane namo</string>
+ <string name="ftue_account_created_personalize">Suasmeninti profilį</string>
+ <string name="ftue_auth_use_case_connect_to_server">Prisijungti prie serverio</string>
+ <string name="ftue_auth_use_case_join_existing_server">Norite prisijungti prie esamo serverio\?</string>
+ <string name="ftue_auth_use_case_skip_partial">Praleisti šį klausimą</string>
+ <string name="ftue_auth_welcome_back_title">Sveiki sugrįžę!</string>
+ <string name="ftue_auth_terms_subtitle">Perskaitykite %s sąlygas ir taisykles</string>
+ <string name="ftue_auth_terms_title">Serverio politikos</string>
+ <string name="ftue_auth_reset_password_breaker_title">Patikrinkite savo el. paštą.</string>
+ <string name="ftue_auth_choose_server_ems_cta">Susisiekite su mumis</string>
+ <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) yra tvirta ir patikima talpinimo paslauga, skirta greitam ir saugiam bendravimui realiuoju laiku. Sužinokite, kaip <a href=\"${ftue_ems_url}\">element.io/ems</a></string>
+ <string name="ftue_auth_choose_server_ems_title">Norite turėti savo serverį\?</string>
+ <string name="ftue_auth_reset_password_email_subtitle">%s atsiųs jums patvirtinimo nuorodą</string>
+ <string name="ftue_auth_choose_server_entry_hint">Serverio URL</string>
+ <string name="ftue_auth_phone_confirmation_entry_title">Patvirtinimo kodas</string>
+ <string name="ftue_auth_choose_server_sign_in_subtitle">Koks yra jūsų serverio adresas\?</string>
+ <string name="ftue_auth_choose_server_subtitle">Koks yra jūsų serverio adresas\? Tai tarsi visų jūsų duomenų namai</string>
+ <string name="ftue_auth_choose_server_title">Pasirinkti savo serverį</string>
+ <string name="ftue_auth_phone_entry_title">Telefono numeris</string>
+ <string name="ftue_auth_phone_subtitle">%s turi patvirtinti jūsų paskyrą</string>
+ <string name="ftue_auth_phone_title">Įveskite savo telefono numerį</string>
+ <string name="ftue_auth_email_entry_title">El. paštas</string>
+ <string name="ftue_auth_email_subtitle">%s turi patvirtinti jūsų paskyrą</string>
+ <string name="ftue_auth_email_title">Įveskite savo el. paštą</string>
+ <string name="ftue_auth_new_password_subtitle">Įsitikinkite, kad jis yra 8 ar daugiau simbolių.</string>
+ <string name="ftue_auth_new_password_title">Pasirinkite naują slaptažodį</string>
+ <string name="ftue_auth_new_password_entry_title">Naujas slaptažodis</string>
+ <string name="settings_notifications_targets">Pranešimų tikslai</string>
+ <string name="settings_olm_version">olm versija</string>
+ <string name="settings_integrations_summary">Naudokite integracijų tvarkyklę botams, tiltams, valdikliams ir lipdukų paketams tvarkyti.
+\nIntegracijų valdytojai gauna konfigūracijos duomenis ir gali keisti valdiklius, siųsti kvietimus į kambarius ir nustatyti galios lygius jūsų vardu.</string>
+ <string name="settings_contacts_phonebook_country">Telefonų knygos šalis</string>
+ <string name="settings_contact">Vietiniai kontaktai</string>
+ <string name="settings_pin_missed_notifications">Prisegti kambarius su praleistais pranešimais</string>
+ <string name="settings_home_display">Pradžios ekranas</string>
+ <string name="settings_inline_url_preview_summary">Nuorodų peržiūra pokalbyje, kai jūsų namų serveris palaiko šią funkciją.</string>
+ <string name="settings_inline_url_preview">Įterptinė URL peržiūra</string>
+ <string name="settings_pin_unread_messages">Prisegti kambarius su neperskaitytomis žinutėmis</string>
+ <string name="settings_integrations">Integracijos</string>
+ <string name="settings_cryptography_manage_keys">Kriptografijos raktų valdymas</string>
+ <string name="settings_cryptography">Kriptografija</string>
+ <string name="analytics_opt_in_content">Padėkite mums nustatyti problemas ir tobulinti ${app_name} dalydamiesi anoniminiais naudojimo duomenimis. Kad suprastume, kaip žmonės naudojasi keliais įrenginiais, sugeneruosime atsitiktinį identifikatorių, kuriuo dalijasi jūsų įrenginiai.
+\n
+\nGalite perskaityti visas mūsų sąlygas %s.</string>
+ <string name="settings_presence_user_always_appears_offline_summary">Jei įjungta, kitiems naudotojams visada atrodysite neprisijungę, net jei naudosite programą.</string>
+ <string name="settings_presence_user_always_appears_offline">Neprisijungęs režimas</string>
+ <string name="settings_presence">Esamumas</string>
+ <string name="media_saving_period_forever">Amžinai</string>
+ <string name="media_saving_period_1_month">1 mėnuo</string>
+ <string name="media_saving_period_1_week">1 savaitė</string>
+ <string name="media_saving_period_3_days">3 dienos</string>
+ <string name="settings_play_shutter_sound">Groti užrakto garsą</string>
+ <string name="media_source_choose">Pasirinkti</string>
+ <string name="settings_default_media_source">Numatytasis medijos šaltinis</string>
+ <string name="compression_opt_list_choose">Pasirinkti</string>
+ <string name="settings_default_compression">Numatytasis glaudinimas</string>
+ <string name="settings_media">Medija</string>
+ <string name="settings_select_country">Pasirinkti šalį</string>
+ <string name="settings_discovery_consent_notice_on">Sutikote siųsti el. paštus ir telefono numerius į šį tapatybės serverį, kad būtų galima atrasti kitus naudotojus iš jūsų kontaktų.</string>
+ <string name="identity_server_consent_dialog_title_2">Siųsti el. paštus ir telefono numerius į %s</string>
+ <string name="settings_discovery_consent_action_give_consent">Duoti sutikimą</string>
+ <string name="settings_discovery_consent_action_revoke">Atšaukti mano sutikimą</string>
+ <string name="settings_discovery_consent_notice_off_2">Jūsų kontaktai yra privatūs. Kad galėtume rasti naudotojus iš jūsų kontaktų, mums reikia jūsų leidimo siųsti kontaktinę informaciją į jūsų tapatybės serverį.</string>
+ <string name="settings_discovery_confirm_mail_not_clicked">Išsiuntėme jums patvirtinimo el. laišką į %s, pirmiausia patikrinkite savo el. paštą ir spustelėkite patvirtinimo nuorodą</string>
+ <string name="settings_discovery_confirm_mail">Išsiuntėme jums patvirtinimo el. laišką į %s, patikrinkite savo el. paštą ir spustelėkite patvirtinimo nuorodą</string>
+ <string name="settings_discovery_msisdn_title">Atrandami telefono numeriai</string>
+ <string name="settings_discovery_disconnect_identity_server_info">Atsijungimas nuo tapatybės serverio reiškia, kad jūsų negalės rasti kiti naudotojai ir negalėsite pakviesti kitų el. paštu ar telefonu.</string>
+ <string name="settings_discovery_no_msisdn">Pridėjus telefono numerį bus rodomos atradimo parinktys.</string>
+ <string name="settings_discovery_no_mails">Pridėjus el. pašto adresą, bus rodomos atradimo parinktys.</string>
+ <string name="settings_discovery_emails_title">Atrandami el. pašto adresai</string>
+ <string name="settings_discovery_identity_server_info_none">Šiuo metu nenaudojate tapatybės serverio. Norėdami atrasti esamus žinomus kontaktus ir būti jų atrandami, sukonfigūruokite jį žemiau.</string>
+ <string name="settings_discovery_identity_server_info">Šiuo metu naudojate %1$s, esamų kontaktų atradimui, kuriuos pažįstate, ir kad būtumėte jų atrandami.</string>
+ <string name="settings_discovery_no_policy_provided">Tapatybės serveris nepateikė jokios politikos</string>
+ <string name="beta">BETA</string>
+ <string name="send_feedback_threads_info">Temos yra nebaigtas darbas, kuriame bus naujų, įdomių būsimų funkcijų, pvz., patobulinti pranešimai. Norėtume išgirsti jūsų atsiliepimus!</string>
+ <string name="send_feedback_threads_title">Temų Beta atsiliepimai</string>
+ <string name="settings_emails_and_phone_numbers_summary">Tvarkyti el. paštus ir telefono numerius susietus su jūsų Matrix paskyra</string>
+ <string name="settings_emails_and_phone_numbers_title">El. paštai ir telefono numeriai</string>
+ <string name="settings_unignore_user">Rodyti visas žinutes nuo %s\?</string>
+ <string name="settings_password_updated">Jūsų slaptažodis buvo atnaujintas</string>
+ <string name="settings_fail_to_update_password_invalid_current_password">Slaptažodis nėra tinkamas</string>
+ <string name="settings_fail_to_update_password">Nepavyko atnaujinti slaptažodžio</string>
+ <string name="settings_new_password">Naujas slaptažodis</string>
+ <string name="settings_old_password">Dabartinis slaptažodis</string>
+ <string name="settings_change_password">Keisti slaptažodį</string>
+ <string name="settings_password">Slaptažodis</string>
+ <string name="account_phone_number_already_used_error">Šis telefono numeris jau naudojamas.</string>
+ <string name="account_email_already_used_error">Šis el. pašto adresas jau naudojamas.</string>
+ <string name="account_email_validation_message">Patikrinkite savo el. paštą ir spustelėkite jame esančią nuorodą. Kai tai padarysite, spauskite tęsti.</string>
+ <string name="analytics_opt_in_title">Padėkite tobulinti ${app_name}</string>
+ <string name="settings_opt_in_of_analytics_summary">${app_name} renka anoniminę analizę, kad galėtume tobulinti programą.</string>
+ <string name="settings_select_language">Pasirinkti kalbą</string>
+ <string name="settings_interface_language">Kalba</string>
+ <string name="settings_opt_in_of_analytics">Siųsti analitikos duomenis</string>
+ <string name="settings_analytics">Analitika</string>
+ <string name="settings_discovery_manage">Tvarkyti atradimo nustatymus.</string>
+ <string name="settings_discovery_category">Atradimas</string>
+ <string name="settings_deactivate_my_account">Deaktyvuoti mano paskyrą</string>
+ <string name="reset_secure_backup_warning">Tai pakeis dabartinį raktą arba frazę.</string>
+ <string name="reset_secure_backup_title">Generuoti naują saugumo raktą arba nustatyti naują esamos atsarginės kopijos saugumo frazę.</string>
+ <string name="settings_secure_backup_section_info">Apsisaugokite nuo užšifruotų žinučių ir duomenų praradimo, darydami šifravimo raktų atsargines kopijas serveryje.</string>
+ <string name="settings_secure_backup_enter_to_setup">Nustatyti šiame įrenginyje</string>
+ <string name="settings_secure_backup_reset">Nustatyti saugią atsarginę kopiją iš naujo</string>
+ <string name="settings_secure_backup_setup">Nustatyti saugią atsarginę kopiją</string>
+ <string name="settings_secure_backup_section_title">Saugi atsarginė kopija</string>
+ <string name="settings_show_emoji_keyboard_summary">Pridėti žinutės kompozitoriuje mygtuką jaustukų klaviatūros atidarymui</string>
+ <string name="settings_show_emoji_keyboard">Rodyti jaustukų klaviatūrą</string>
+ <string name="settings_send_message_with_enter_summary">Programinės klaviatūros mygtukas Enter išsiųs žinutę, o ne pridės eilutės pertrauką</string>
+ <string name="settings_send_message_with_enter">Siųsti žinutę su enter</string>
+ <string name="settings_preview_media_before_sending">Medijos peržiūra prieš siunčiant</string>
+ <string name="settings_vibrate_on_mention">Vibruoti paminėjus naudotoją</string>
+ <string name="settings_show_avatar_display_name_changes_messages_summary">Įtraukiami avataro ir rodomojo vardo keitimai.</string>
+ <string name="settings_show_avatar_display_name_changes_messages">Rodyti paskyrų įvykius</string>
+ <string name="settings_show_join_leave_messages_summary">Kvietimai, pašalinimai ir užblokavimai nėra įtakojami.</string>
+ <string name="settings_show_join_leave_messages">Rodyti prisijungimo ir išėjimo įvykius</string>
+ <string name="settings_autoplay_animated_images_summary">Paleisti animuotus paveikslėlius laiko juostoje, kai tik jie tampa matomi</string>
+ <string name="settings_autoplay_animated_images_title">Automatinis animuotų vaizdų paleidimas</string>
+ <string name="settings_chat_effects_description">Naudokite /confetti komandą arba siųskite žinutę, kurioje yra ❄️ arba 🎉</string>
+ <string name="settings_chat_effects_title">Rodyti pokalbio efektus</string>
+ <string name="settings_show_read_receipts_summary">Spustelėkite ant skaitymo kvitų, kad pamatytumėte išsamų sąrašą.</string>
+ <string name="settings_show_read_receipts">Rodyti skaitymo kvitus</string>
+ <string name="settings_12_24_timestamps">Rodyti laiko žymas 12 valandų formatu</string>
+ <string name="settings_contacts_app_permission">Leidimas naudotis kontaktais</string>
+ <string name="settings_always_show_timestamps">Rodyti laiko žymas visoms žinutėms</string>
+ <string name="settings_send_markdown_summary">Prieš siunčiant žinutes, suformatuoti jas naudojant Markdown sintakse. Tai leidžia atlikti išplėstinį formatavimą, pavyzdžiui, naudoti žvaigždutes tekstui kursyvu rodyti.</string>
+ <string name="settings_send_markdown">Markdown formatavimas</string>
+ <string name="settings_user_interface">Naudotojo sąsaja</string>
+ <string name="settings_send_typing_notifs_summary">Leisti kitiems naudotojams žinoti, kad rašote.</string>
+ <string name="disabled_integration_dialog_content">Norėdami tai daryti, Įjunkite \'Leisti integracijas\' nustatymuose.</string>
+ <string name="settings_send_typing_notifs">Siųsti pranešimus apie rašymą</string>
+ <string name="legals_third_party_notices">Trečiųjų šalių bibliotekos</string>
+ <string name="legals_identity_server_title">Jūsų tapatybės serverio politika</string>
+ <string name="legals_home_server_title">Jūsų namų serverio politika</string>
+ <string name="legals_application_title">${app_name} politika</string>
+ <string name="settings_integration_manager">Integracijų tvarkyklė</string>
+ <string name="settings_integration_allow">Leisti integracijas</string>
+ <string name="settings_identity_server">Tapatybės serveris</string>
+ <string name="settings_home_server">Namų serveris</string>
+ <string name="settings_logged_in">Prisijungta kaip</string>
+ <string name="devices_delete_dialog_title">Autentifikacija</string>
+ <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+ <string name="devices_details_last_seen_title">Paskutinį kartą matytas</string>
+ <string name="devices_details_device_name">Atnaujinti viešą pavadinimą</string>
+ <string name="devices_details_name_title">Viešas pavadinimas</string>
+ <string name="settings_deactivate_account_section">Deaktyvuoti paskyrą</string>
+ <string name="devices_details_id_title">ID</string>
+ <string name="analytics_opt_in_list_item_3">Tai galite bet kada išjungti nustatymuose</string>
+ <string name="analytics_opt_in_list_item_2">Mes <b>nesidalijame</b> informacija su trečiosiomis šalimis</string>
+ <string name="analytics_opt_in_list_item_1">Mes <b>neįrašome ir neprofiliuojame</b> jokių paskyros duomenų</string>
+ <string name="analytics_opt_in_content_link">čia</string>
+ <string name="disabled_integration_dialog_title">Integracijos yra išjungtos</string>
+ <string name="legals_no_policy_provided">Šis serveris nepateikia jokios politikos.</string>
+ <string name="notice_call_candidates_by_you">Išsiuntėte duomenis skambučiui nustatyti.</string>
+ <string name="settings_discovery_hide_identity_server_policy_title">Slėpti tapatybės serverio politiką</string>
+ <string name="settings_discovery_show_identity_server_policy_title">Rodyti tapatybės serverio politiką</string>
+ <string name="downloaded_file">Failas %1$s buvo atsiųstas!</string>
+ <string name="send_file_step_compressing_video">Suglaudinamas vaizdo įrašas %d%%</string>
+ <string name="send_file_step_compressing_image">Suglaudinamas paveikslėlis…</string>
+ <string name="send_file_step_sending_file">Siunčiamas failas (%1$s / %2$s)</string>
+ <string name="send_file_step_sending_thumbnail">Siunčiama miniatiūra (%1$s / %2$s)</string>
+ <string name="send_file_step_encrypting_file">Užšifruojamas failas…</string>
+ <string name="send_file_step_encrypting_thumbnail">Užšifruojama miniatiūra…</string>
+ <string name="room_filtering_footer_title">Nerandate to, ko ieškote\?</string>
+ <string name="send_file_step_idle">Laukiama…</string>
+ <string name="room_filtering_filter_hint">Filtruoti pokalbius…</string>
+ <string name="no_message_edits_found">Redagavimų nerasta</string>
+ <string name="message_edits">Žinutės redagavimai</string>
+ <string name="edited_suffix">(redaguota)</string>
+ <string name="labs_show_unread_notifications_as_tab">Pagrindiniame ekrane pridėti specialų skirtuką neperskaitytiems pranešimams.</string>
+ <string name="labs_swipe_to_reply_in_timeline">Įjungti perbraukimą, kad atsakytumėte laiko juostoje</string>
+ <string name="search_hint_room_name">Ieškoti pavadinimo</string>
+ <string name="user_directory_search_hint_2">Ieškoti pagal vardą, ID arba paštą</string>
+ <string name="room_directory_search_hint">Pavadinimas arba ID (#pavyzdys:matrix.org)</string>
+ <string name="room_filtering_footer_open_room_directory">Peržiūrėti kambarių katalogą</string>
+ <string name="room_filtering_footer_create_new_direct_message">Siųsti naują tiesioginę žinutę</string>
+ <string name="bottom_action_people_x">Tiesioginės žinutės</string>
+ <string name="room_filtering_footer_create_new_room">Sukurti naują kambarį</string>
+ <string name="direct_room_user_list_suggestions_title">Pasiūlymai</string>
+ <string name="direct_room_user_list_known_title">Žinomi naudotojai</string>
+ <string name="creating_direct_room">Kuriamas kambarys…</string>
+ <string name="qr_code">QR kodas</string>
+ <string name="add_by_qr_code">Pridėti pagal QR kodą</string>
+ <string name="terms_description_for_identity_server">Būkite atrandami kitų</string>
+ <string name="terms_of_service">Paslaugų teikimo sąlygos</string>
+ <string name="message_view_edit_history">Peržiūrėti redagavimo istoriją</string>
+ <string name="link_copied_to_clipboard">Nuoroda nukopijuota į iškarpinę</string>
+ <string name="open_discovery_settings">Atidaryti atradimo nustatymus</string>
+ <string name="settings_labs_show_complete_history_in_encrypted_room">Rodyti pilną istoriją užšifruotuose kambariuose</string>
+ <string name="settings_labs_show_hidden_events_in_timeline">Rodyti paslėptus įvykius laiko juostoje</string>
+ <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Iš naujo nustatyti pranešimų metodą</string>
+ <string name="settings_troubleshoot_test_token_registration_quick_fix">Registruoti žetoną</string>
+ <string name="preference_system_settings">Sistemos nustatymai</string>
+ <string name="settings_push_gateway_no_pushers">Nėra registruotų tiesioginių pranešimų vartų</string>
+ <string name="settings_push_rules_no_rules">Nėra nustatytų tiesioginų pranešimų taisyklių</string>
+ <string name="settings_push_rules">Tiesioginių pranešimų taisyklės</string>
+ <string name="settings_security_and_privacy">Saugumas & Privatumas</string>
+ <string name="settings_preferences">Nuostatos</string>
+ <string name="settings_general_title">Bendrieji</string>
+ <string name="settings_other_third_party_notices">Kiti trečiųjų šalių pranešimai</string>
+ <string name="settings_sdk_version">Matrix SDK versija</string>
+ <string name="create_room_settings_section">Kambario nustatymai</string>
+ <string name="settings_show_redacted_summary">Rodyti pašalintų žinučių vietoje užrašą</string>
+ <string name="settings_show_redacted">Rodyti pašalintas žinutes</string>
+ <string name="keys_backup_settings_delete_confirm_message">ištrinti iš serverio atsarginę šifravimo raktų kopiją\? Atkūrimo rakto nebegalėsite naudoti užšifruotai žinučių istorijai skaityti.</string>
+ <string name="keys_backup_settings_delete_confirm_title">Ištrinti atsarginę kopiją</string>
+ <string name="keys_backup_settings_checking_backup_state">Tikrinama atsarginės kopijos būsena</string>
+ <string name="keys_backup_settings_deleting_backup">Atsarginė kopija ištrinama…</string>
+ <string name="keys_backup_settings_untrusted_backup">Jei norite naudoti atsarginę raktų kopiją šioje sesijoje, dabar atkurkite naudodami slaptažodį arba atkūrimo raktą.</string>
+ <string name="keys_backup_settings_invalid_signature_from_unverified_device">Atsarginė kopija turi netinkamą parašą iš nepatvirtintos sesijos %s</string>
+ <string name="keys_backup_settings_invalid_signature_from_verified_device">Atsarginė kopija turi netinkamą parašą iš patvirtintos sesijos %s</string>
+ <string name="settings_labs_native_camera_summary">Įjungti sistemos kamerą, vietoj pritaikytos kameros ekrano.</string>
+ <string name="settings_labs_native_camera">Naudoti vietinę kamerą</string>
+ <string name="encryption_information_verify_device_warning">Patvirtinkite palygindami šiuos duomenis su naudotojo nustatymais kitoje sesijoje:</string>
+ <string name="encryption_settings_manage_message_recovery_summary">Tvarkyti raktų atsarginę kopiją</string>
+ <string name="settings_theme">Tema</string>
+ <string name="room_settings_unset_main_address">Atšaukti nustatymą pagrindiniu adresu</string>
+ <string name="room_settings_set_main_address">Nustatyti kaip pagrindinį adresą</string>
+ <string name="room_settings_labs_warning_message">Tai eksperimentinės funkcijos, kurios gali netikėtai sugesti. Naudokite atsargiai.</string>
+ <string name="room_settings_labs_pref_title">Laboratorijos</string>
+ <string name="room_settings_room_version_title">Kambario versija</string>
+ <string name="room_settings_room_internal_id">Šio kambario vidinis ID</string>
+ <string name="room_settings_category_advanced_title">Išplėstiniai</string>
+ <plurals name="room_settings_banned_users_count">
+ <item quantity="one">%d užblokuotas naudotojas</item>
+ <item quantity="few">%d užblokuoti naudotojai</item>
+ <item quantity="other">%d užblokuotų naudotojų</item>
+ </plurals>
+ <string name="room_settings_banned_users_title">Užblokuoti naudotojai</string>
+ <string name="room_settings_room_access_public_description">Bet kas gali rasti kambarį ir prisijungti</string>
+ <string name="room_settings_room_access_public_title">Viešas</string>
+ <string name="room_settings_room_access_private_description">Tik pakviesti žmonės gali rasti ir prisijungti</string>
+ <string name="room_settings_room_access_private_invite_only_title">Privatus (tik su kvietimais)</string>
+ <string name="room_settings_room_access_private_title">Privatus</string>
+ <string name="room_settings_room_access_entry_unknown">Nežinomas prieigos nustatymas (%s)</string>
+ <string name="room_settings_room_access_entry_knock">Bet kas gali pasibelsti į kambarį, o nariai gali priimti arba atmesti</string>
+ <string name="room_settings_read_history_entry_members_only_joined">Tik nariai (nuo jų prisijungimo)</string>
+ <string name="room_settings_read_history_entry_members_only_invited">Tik nariai (nuo jų pakvietimo)</string>
+ <string name="room_settings_read_history_entry_members_only_option_time_shared">Tik nariai (nuo šios parinkties pasirinkimo momento)</string>
+ <string name="room_settings_read_history_entry_anyone">Bet kas</string>
+ <string name="room_settings_guest_access_title">Leisti svečiams prisijungti</string>
+ <string name="room_settings_room_notifications_notify_me">Pranešti man apie</string>
+ <string name="room_settings_alias_subtitle">Peržiūrėti ir tvarkyti šio kambario adresus bei jo matomumą kambarių kataloge.</string>
+ <string name="room_settings_access_rules_pref_dialog_title">Kas gali prieiti\?</string>
+ <string name="room_settings_room_read_history_dialog_subtitle">Pakeitimai, kas gali skaityti istoriją, bus taikomi tik būsimoms šio kambario žinutėms. Esamos istorijos matomumas išliks nepakitęs.</string>
+ <string name="room_settings_room_read_history_rules_pref_dialog_title">Kas gali skaityti istoriją\?</string>
+ <string name="room_settings_room_read_history_rules_pref_title">Kambario istorijos skaitomumas</string>
+ <string name="room_settings_room_notifications_account_settings">Paskyros nustatymai</string>
+ <string name="room_settings_topic">Tema</string>
+ <string name="room_settings_alias_title">Kambario adresai</string>
+ <string name="room_settings_room_access_title">Kambario prieiga</string>
+ <string name="room_settings_room_notifications_manage_notifications">Pranešimus galite tvarkyti %1$s.</string>
+ <string name="room_settings_room_notifications_encryption_notice">Atkreipkite dėmesį, kad pranešimai apie paminėjimus ir raktinius žodžius užšifruotuose kambariuose, nėra prieinami mobiliuosiuose įrenginiuose.</string>
+ <string name="settings_notification_configuration">Pranešimų konfigūracija</string>
+ <string name="settings_security_prevent_screenshots_summary">Įjungus šį nustatymą, prie visų veiksmų pridedamas žymuo FLAG_SECURE. Iš naujo paleiskite programą, kad pakeitimas įsigaliotų.</string>
+ <string name="settings_security_prevent_screenshots_title">Neleisti programos ekrano nuotraukų</string>
+ <string name="auth_biometric_key_invalidated_message">Biometrinis autentifikavimas buvo išjungtas, nes neseniai buvo pridėtas naujas biometrinis autentifikavimo metodas. Jį vėl galite įjungti nustatymuose.</string>
+ <string name="settings_security_pin_code_use_biometrics_error">Nepavyko įjungti biometrinio autentifikavimo.</string>
+ <string name="a11y_open_settings">Atidaryti nustatymus</string>
+ <string name="labs_enable_deferred_dm_summary">Sukurti AŽ tik po pirmos žinutės</string>
+ <string name="labs_enable_deferred_dm_title">Įjungti atidėtas AŽ</string>
+ <string name="labs_enable_new_app_layout_summary">Supaprastintas Element su nebūtinais skirtukais</string>
+ <string name="labs_enable_new_app_layout_title">Įjungti naują išdėstymą</string>
+</resources>
\ No newline at end of file
diff --git a/library/ui-strings/src/main/res/values-pl/strings.xml b/library/ui-strings/src/main/res/values-pl/strings.xml
index b7b73eb9e6..c9bac8977b 100644
--- a/library/ui-strings/src/main/res/values-pl/strings.xml
+++ b/library/ui-strings/src/main/res/values-pl/strings.xml
@@ -732,7 +732,7 @@
<string name="settings_send_message_with_enter">Wysyłaj wiadomości za pomocą klawisza enter</string>
<string name="settings_send_message_with_enter_summary">Przycisk enter na klawiaturze programowej wyśle wiadomość zamiast wprowadzania łamanania linii</string>
<string name="settings_discovery_category">Ustawienia wyszukiwania</string>
- <string name="settings_discovery_manage">Ustal jak inni mogą odnaleść twoje konto.</string>
+ <string name="settings_discovery_manage">Ustal jak inni mogą odnaleźć twoje konto.</string>
<string name="settings_media">Media</string>
<string name="settings_default_media_source">Domyślne źródło mediów</string>
<string name="encryption_message_recovery">Odzyskiwanie zaszyfrowanych wiadomości</string>
@@ -2732,4 +2732,16 @@
<string name="timeline_error_room_not_found">Niestety, ten pokój nie został znaleziony.
\nSpróbuj ponownie później.%s</string>
<string name="invites_title">Zaproszenia</string>
-</resources>
+ <string name="home_empty_no_unreads_message">Tutaj pojawią się rozmowy które nie zostały jeszcze odczytane.</string>
+ <string name="home_empty_no_unreads_title">Brak nowych wiadomości.</string>
+ <string name="change_space">Zmień przestrzeń</string>
+ <string name="labs_enable_deferred_dm_summary">Stwórz prywatny chat dopiero po wysłaniu pierwszej wiadomości</string>
+ <string name="labs_enable_deferred_dm_title">Włącz odroczone prywatne chaty</string>
+ <string name="labs_enable_new_app_layout_summary">Odświeżony wygląd Element z opcjonalnymi kartami</string>
+ <string name="labs_enable_new_app_layout_title">Włącz nowy układ</string>
+ <string name="home_empty_space_no_rooms_message">Przestrzenie to nowa metoda na grupowanie razem wielu pokoi i osób. Dodaj tu już istniejący pokój lub stwórz nowy używając przycisku w prawym-dolnym rogu.</string>
+ <string name="space_list_empty_message">Jest to nowa metoda na grupowanie razem wielu pokoi i osób.</string>
+ <string name="home_empty_space_no_rooms_title">%s
+\nwygląda nieco pusto.</string>
+ <string name="space_list_empty_title">Brak przestrzeni.</string>
+</resources>
\ No newline at end of file
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 817c7646df..108ecc7e38 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
@@ -473,7 +473,7 @@
<string name="start_video_call_prompt_msg">Você tem certeza que você quer começar uma chamada de vídeo\?</string>
<string name="option_take_photo">Tirar foto</string>
<string name="option_take_video">Tirar vídeo</string>
- <string name="call">Chamar</string>
+ <string name="call">Chamada</string>
<string name="room_participants_ban_prompt_msg">Banir usuária(o) vai removê-la(o) desta sala e preveni-la(o) de se juntar de novo.</string>
<string name="room_settings_all_messages">Todas as mensagens</string>
<string name="room_settings_add_homescreen_shortcut">Adicionar a tela de Início</string>
@@ -2460,7 +2460,7 @@
<string name="threads_beta_enable_notice_message">Threads ajudam manThreads ajudam manter suas conversas em-tópico e fáceis de rastrear. %sHabilitar threads vai refrescar o app. Isto pode tomar mais tempo para algumas contas.</string>
<string name="threads_beta_enable_notice_title">Threads Beta</string>
<string name="action_learn_more">Saber mais</string>
- <string name="action_try_it_out">Teste aí</string>
+ <string name="action_try_it_out">Experimentar</string>
<string name="screen_sharing_notification_description">Compartilhamento de tela está em progresso</string>
<string name="screen_sharing_notification_title">${app_name} Compartilhamento de Tela</string>
<string name="call_stop_screen_sharing">Parar compartilhamento de tela</string>
@@ -2633,15 +2633,15 @@
<string name="timeline_error_room_not_found">Desculpe, esta sala não tem sido encontrada.
\nPor favor retente mais tarde.%s</string>
<string name="invites_title">Convites</string>
- <string name="onboarding_new_app_layout_button_try">Teste aí</string>
+ <string name="onboarding_new_app_layout_button_try">Experimentar</string>
<string name="onboarding_new_app_layout_feedback_message">Toque na direita topo para ver a opção para feedback.</string>
- <string name="onboarding_new_app_layout_feedback_title">Dar Feedback</string>
- <string name="onboarding_new_app_layout_spaces_message">Acessar seus Espaços (direito fundo) mais rápido e fácio que jamais antes.</string>
- <string name="onboarding_new_app_layout_spaces_title">Acessar Espaços</string>
+ <string name="onboarding_new_app_layout_feedback_title">Dê Feedback</string>
+ <string name="onboarding_new_app_layout_spaces_message">Acesse seus Espaços (direita fundo) mais rápido e fácil que jamais antes.</string>
+ <string name="onboarding_new_app_layout_spaces_title">Acesse Espaços</string>
<string name="onboarding_new_app_layout_welcome_message">Para simplificar seu ${app_name}, abas são agora opcionais. Gerencie-as usando o menu direito topo.</string>
<string name="onboarding_new_app_layout_welcome_title">Boas-vindas a uma nova visão!</string>
<string name="home_empty_no_unreads_message">Isto é onde suas mensagens não-lidas vão aparecer, quando você tiver algumas.</string>
- <string name="home_empty_no_unreads_title">Nada a reportar.</string>
+ <string name="home_empty_no_unreads_title">Nada para reportar.</string>
<string name="home_empty_no_rooms_message">O app de chat seguro tudo-em-um para equipes, amigas(os) e organizações. Crie um chat, ou junte-se a uma sala existe, para começar.</string>
<string name="home_empty_no_rooms_title">Boas-vindas a ${app_name},
\n%s.</string>
@@ -2658,8 +2658,8 @@
<string name="device_manager_header_section_security_recommendations_description">Melhore a segurança de sua conta ao seguir estas recomendações.</string>
<string name="device_manager_header_section_security_recommendations_title">Recomendações de segurança</string>
<plurals name="device_manager_other_sessions_description_inactive">
- <item quantity="one">Inativa(o) por %1$d+ dia (%2$s)</item>
- <item quantity="other">Inativa(o) por %1$d+ dias (%2$s)</item>
+ <item quantity="one">Inativa por %1$d+ dia (%2$s)</item>
+ <item quantity="other">Inativa por %1$d+ dias (%2$s)</item>
</plurals>
<string name="invites_empty_message">Isto é onde suas novas requisições e convites vão estar.</string>
<string name="invites_empty_title">Nada novo.</string>
@@ -2668,4 +2668,46 @@
<string name="a11y_collapse_space_children">Colapsar filhos de %s</string>
<string name="a11y_expand_space_children">Expandir filhos de %s</string>
<string name="change_space">Mudar Espaço</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Não-verificadas</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Verificadas</string>
+ <string name="device_manager_filter_option_unverified">Não-verificadas</string>
+ <string name="device_manager_filter_option_verified">Verificadas</string>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Inativas</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">Inativas por %1$d dia ou mais longo</item>
+ <item quantity="other">Inativas por %1$d dias ou mais longo</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Inativas</string>
+ <string name="device_manager_session_details_device_ip_address">Endereço de IP</string>
+ <string name="device_manager_session_details_session_last_activity">Última atividade</string>
+ <string name="device_manager_session_details_session_name">Nome de sessão</string>
+ <string name="device_manager_session_details_description">Informação de aplicativo, dispositivo, e atividade.</string>
+ <string name="device_manager_session_details_title">Detalhes de sessão</string>
+ <string name="device_manager_other_sessions_clear_filter">Limpar Filtro</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Nenhuma sessão inativa encontrada.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Nenhuma sessão não-verificada encontrada.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Nenhuma sessão verificada encontrada.</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="one">Considere fazer signout de sessões antigas (%1$d dia ou mais) que você não usa mais.</item>
+ <item quantity="other">Considere fazer signout de sessões antigas (%1$d dias ou mais) que você não usa mais.</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Verifique suas sessões para mensageria segura melhorada ou faça signout daquelas que você não reconhece ou usa mais.</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">Para melhor segurança, faça signout de qualquer sessão que você não reconhece ou usa mais.</string>
+ <string name="a11y_device_manager_filter">Filtrar</string>
+ <string name="device_manager_filter_option_verified_description">Pronta para mensageria segura</string>
+ <string name="device_manager_filter_option_unverified_description">Não pronta para mensageria segura</string>
+ <string name="device_manager_filter_option_all_sessions">Todas as sessões</string>
+ <string name="device_manager_filter_bottom_sheet_title">Filtrar</string>
+ <string name="device_manager_session_last_activity">Última atividade %1$s</string>
+ <string name="device_manager_device_title">Dispositivo</string>
+ <string name="device_manager_session_title">Sessão</string>
+ <string name="device_manager_current_session_title">Sessão Atual</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Verifique ou faça signout desta sessão para melhor segurança e fiabilidade.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Verifique sua sessão atual para mensageria segura melhorada.</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Esta sessão está pronta para mensageria segura.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Sua sessão atual está pronta para mensageria segura.</string>
+ <string name="labs_enable_deferred_dm_summary">Criar DM somente em primeira mensagem</string>
+ <string name="labs_enable_deferred_dm_title">Habilitar DMs diferidas</string>
+ <string name="labs_enable_new_app_layout_summary">Um Element simplificado com abas opcionais</string>
+ <string name="labs_enable_new_app_layout_title">Habilitar novo layout</string>
</resources>
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 7c9d073035..c8eee49d96 100644
--- a/library/ui-strings/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -273,7 +273,7 @@
<string name="home_filter_placeholder_home">Фильтр названий комнат</string>
<string name="invitations_header">Приглашения</string>
<string name="low_priority_header">Маловажные</string>
- <string name="direct_chats_header">Беседы</string>
+ <string name="direct_chats_header">Личные сообщения</string>
<string name="matrix_only_filter">Только Matrix контакты</string>
<string name="no_result_placeholder">Нет результатов</string>
<string name="rooms_header">Комнаты</string>
@@ -452,7 +452,7 @@
<string name="encryption_information_verify_device_warning">Чтобы убедиться, что этой сессии можно доверять, обратитесь к ее владельцу, используя другие способы (например, лично или по телефону), и спросите, соответствует ли ключ, который он видит в настройках для этой сессии:</string>
<string name="encryption_information_verify_device_warning2">Если они не совпадают, безопасность вашего общения может быть поставлена под угрозу.</string>
<string name="select_room_directory">Выбор каталога комнат</string>
- <string name="directory_server_placeholder">Имя сервера</string>
+ <string name="directory_server_placeholder">Название сервера</string>
<string name="directory_server_all_rooms_on_server">Все комнаты на сервере %s</string>
<string name="directory_server_native_rooms">Все местные комнаты %s</string>
<string name="settings_user_interface">Пользовательский интерфейс</string>
@@ -907,16 +907,16 @@
<string name="event_redacted_by_user_reason">Событие удалено пользователем</string>
<string name="event_redacted_by_admin_reason">Событие модерируется администратором комнаты</string>
<string name="malformed_message">Некорректное событие, не могу отобразить</string>
- <string name="create_new_room">Создать новую комнату</string>
+ <string name="create_new_room">Создать комнату</string>
<string name="error_no_network">Нет сети. Пожалуйста, проверьте подключение к Интернету.</string>
<string name="action_change">Изменить</string>
- <string name="change_room_directory_network">Изменить сеть</string>
+ <string name="change_room_directory_network">Изменить сервер</string>
<string name="please_wait">Пожалуйста, подождите…</string>
<string name="room_preview_no_preview">Эту комнату нельзя предварительно просмотреть</string>
<string name="fab_menu_create_room">Комнаты</string>
<string name="fab_menu_create_chat">Личные сообщения</string>
<string name="create_room_action_create">СОЗДАТЬ</string>
- <string name="create_room_name_hint">Имя</string>
+ <string name="create_room_name_hint">Название</string>
<string name="create_room_public_title">Публичная</string>
<string name="create_room_public_description">Каждый сможет присоединиться к этой комнате</string>
<string name="keys_backup_unable_to_get_trust_info">Произошла ошибка при получении информации о доверии</string>
@@ -927,7 +927,7 @@
<string name="navigate_to_room_when_already_in_the_room">Вы уже просмотрели эту комнату!</string>
<string name="settings_general_title">Общее</string>
<string name="settings_preferences">Предпочтения</string>
- <string name="settings_security_and_privacy">Безопасность и конфиденциальность</string>
+ <string name="settings_security_and_privacy">Безопасность</string>
<string name="settings_push_rules">Правила push-уведомлений</string>
<string name="push_gateway_item_app_id">app_id:</string>
<string name="push_gateway_item_push_key">push_key:</string>
@@ -956,11 +956,11 @@
<string name="no_message_edits_found">Изменения не найдены</string>
<string name="room_filtering_filter_hint">Отфильтровать беседы…</string>
<string name="room_filtering_footer_title">Не можете найти нужное\?</string>
- <string name="room_filtering_footer_create_new_room">Создать новую комнату</string>
- <string name="room_filtering_footer_create_new_direct_message">Отправить новое личное сообщение</string>
- <string name="room_filtering_footer_open_room_directory">Просмотр каталога комнат</string>
- <string name="room_directory_search_hint">Имя или ID (#example:matrix.org)</string>
- <string name="labs_swipe_to_reply_in_timeline">Включить жест смахивания для ответа в ленте сообщений</string>
+ <string name="room_filtering_footer_create_new_room">Создать комнату</string>
+ <string name="room_filtering_footer_create_new_direct_message">Отправить личное сообщение</string>
+ <string name="room_filtering_footer_open_room_directory">Каталог комнат</string>
+ <string name="room_directory_search_hint">Название или ID (#example:matrix.org)</string>
+ <string name="labs_swipe_to_reply_in_timeline">Жест смахивания для ответа в ленте сообщений</string>
<string name="link_copied_to_clipboard">Ссылка скопирована в буфер обмена</string>
<string name="creating_direct_room">Создаем комнату…</string>
<string name="message_view_edit_history">История изменений</string>
@@ -1039,7 +1039,7 @@
<string name="room_widget_webview_access_camera">Использовать камеру</string>
<string name="room_widget_webview_access_microphone">Использовать микрофон</string>
<string name="room_widget_webview_read_protected_media">Получать доступ к медиа, защищённым DRM</string>
- <string name="a11y_create_room">Создать новую комнату</string>
+ <string name="a11y_create_room">Создать комнату</string>
<string name="attachment_type_file">Файл</string>
<string name="attachment_type_camera">Камера</string>
<string name="attachment_type_gallery">Галерея</string>
@@ -1390,7 +1390,7 @@
<string name="verification_request_you_accepted">Вы приняли</string>
<string name="verification_sent">Подтверждение отправлено</string>
<string name="verification_request">Запрос на подтверждение</string>
- <string name="verification_verify_device">Подтвердите эту сессию</string>
+ <string name="verification_verify_device">Заверьте эту сессию</string>
<string name="verification_scan_notice">Сканируйте код с помощью устройства другого пользователя, чтобы безопасно проверить друг друга</string>
<string name="verification_scan_their_code">Сканировать их код</string>
<string name="verification_scan_emoji_title">Невозможно сканировать</string>
@@ -1450,7 +1450,7 @@
<item quantity="few">%d сессии активны</item>
<item quantity="many">%d сессий активно</item>
</plurals>
- <string name="crosssigning_verify_this_session">Подтвердите это устройство</string>
+ <string name="crosssigning_verify_this_session">Заверьте эту сессию</string>
<string name="verification_open_other_to_verify">Используйте существующую сессию для подтверждения этой, предоставив ей доступ к зашифрованным сообщениям.</string>
<string name="settings_dev_tools">Инструменты для разработчиков</string>
<string name="settings_account_data">Данные учётной записи</string>
@@ -1473,13 +1473,13 @@
<string name="bottom_sheet_setup_secure_backup_title">Безопасное резервное копирование</string>
<string name="settings_active_sessions_verified_device_desc">Эта сессия является надежной для безопасного обмена сообщениями, поскольку вы подтвердили ее:</string>
<string name="settings_active_sessions_unverified_device_desc">Подтвердите эту сессию, чтобы пометить её доверенной и предоставить ей доступ к зашифрованным сообщениям. Если вы не входили в эту сессию, ваша учетная запись может быть скомпрометирована:</string>
- <string name="verification_profile_verify">Проверить</string>
- <string name="verification_profile_verified">Проверено</string>
+ <string name="verification_profile_verify">Заверить</string>
+ <string name="verification_profile_verified">Заверено</string>
<string name="verification_profile_warning">Предупреждение</string>
<string name="room_member_profile_failed_to_get_devices">Не удалось получить список сессий</string>
<string name="room_member_profile_sessions_section_title">Сессии</string>
- <string name="trusted">Доверенные</string>
- <string name="not_trusted">Недоверенные</string>
+ <string name="trusted">Заверенная</string>
+ <string name="not_trusted">Незаверенная</string>
<string name="verification_profile_device_verified_because">Эта сессия является доверенной для безопасного обмена сообщениями, так как %1$s (%2$s) проверил(а) его:</string>
<string name="verification_profile_device_new_signing">%1$s (%2$s) вошел(ла), используя новую сессию:</string>
<string name="verification_profile_device_untrust_info">Пока этот пользователь не доверяет этой сессии, сообщения, отправленные в обе стороны, помечаются предупреждениями. Кроме того, вы можете подтвердить сессию вручную.</string>
@@ -2037,7 +2037,7 @@
<string name="space_leave_prompt_msg_only_you">Вы здесь единственный человек. Если вы уйдёте, никто не сможет присоединиться в будущем, включая вас.</string>
<string name="leave_space">Покинуть</string>
<string name="space_add_child_title">Добавить комнаты</string>
- <string name="space_explore_activity_title">Исследуйте комнаты</string>
+ <string name="space_explore_activity_title">Обзор комнат</string>
<plurals name="space_people_you_know">
<item quantity="one">%d человек, которого вы знаете, уже присоединился</item>
<item quantity="few">%d людей, которых вы знаете, уже присоединились</item>
@@ -2116,7 +2116,7 @@
<string name="verification_scan_self_notice">Сканируйте код с помощью другого устройства или переключитесь и сканируйте с помощью этого устройства</string>
<string name="create_space_alias_hint">Адрес пространства</string>
<string name="error_file_too_big_simple">Файл слишком большой для загрузки.</string>
- <string name="search_hint_room_name">Поиск по имени</string>
+ <string name="search_hint_room_name">Поиск по названию</string>
<string name="send_file_step_compressing_video">Сжатие видео %d%%</string>
<string name="send_file_step_compressing_image">Сжатие изображения…</string>
<string name="give_feedback">Оставить отзыв</string>
@@ -2374,11 +2374,11 @@
<string name="attachment_type_poll">Опрос</string>
<string name="create_poll_title">Создать опрос</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="labs_auto_report_uisi_desc">Ваша система будет автоматически отправлять журналы при возникновении ошибки невозможности расшифровки</string>
<string name="labs_auto_report_uisi">Автоматически сообщать об ошибках расшифровки.</string>
<string name="encryption_misconfigured">Шифрование неправильно настроено</string>
- <string name="room_member_override_nick_color">Изменить цвет отображаемого имени</string>
+ <string name="room_member_override_nick_color">Изменить цвет имени</string>
<string name="room_profile_section_restore_security">Восстановить шифрование</string>
<string name="contact_admin_to_restore_encryption">Обратитесь к администратору, чтобы восстановить шифрование до рабочего состояния.</string>
<string name="encryption_has_been_misconfigured">Шифрование настроено неправильно.</string>
@@ -2435,7 +2435,7 @@
<string name="location_timeline_failed_to_load_map">Не удалось загрузить карту</string>
<string name="a11y_static_map_image">Карта</string>
<string name="labs_enable_thread_messages_desc">Примечание: приложение будет перезапущено</string>
- <string name="labs_enable_thread_messages">Включить обсуждения сообщений</string>
+ <string name="labs_enable_thread_messages">Обсуждения сообщений</string>
<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>
@@ -2507,7 +2507,7 @@
<string name="live_location_sharing_notification_description">Идёт отправка местоположения</string>
<string name="location_share_live_remaining_time">Осталось %1$s</string>
<string name="live_location_bottom_sheet_last_updated_at">Обновлено %1$s назад</string>
- <string name="labs_enable_live_location">Включить функцию \"Поделиться трансляцией местоположения\"</string>
+ <string name="labs_enable_live_location">Функция \"Поделиться трансляцией местоположения\"</string>
<string name="live_location_sharing_notification_title">${app_name} Трансляция местоположения</string>
<string name="location_share_live_until">Транслировать до %1$s</string>
<string name="location_share_live_ended">Трансляция завершена</string>
@@ -2665,8 +2665,8 @@
<string name="settings_sessions_list">Сессии</string>
<string name="a11y_create_message">Создать беседу или комнату</string>
<string name="device_manager_settings_active_sessions_show_all">Показать все сессии (V2, в разработке)</string>
- <string name="room_list_filter_people">Люди</string>
- <string name="home_layout_preferences">Настройки макета</string>
+ <string name="room_list_filter_people">ЛС</string>
+ <string name="home_layout_preferences">Настройки вида</string>
<string name="home_layout_preferences_filters">Фильтры</string>
<string name="home_layout_preferences_recents">Недавние</string>
<string name="room_list_filter_favourites">Избранные</string>
@@ -2676,7 +2676,7 @@
<string name="home_layout_preferences_sort_activity">Активности</string>
<string name="home_layout_preferences_sort_by">Сортировать по</string>
<string name="explore_rooms">Обзор комнат</string>
- <string name="start_chat">Начать беседу</string>
+ <string name="start_chat">Отправить ЛС</string>
<string name="create_room">Создать комнату</string>
<string name="device_manager_other_sessions_view_all">Посмотреть все (%1$d)</string>
<string name="device_manager_header_section_security_recommendations_description">Повысьте безопасность учётной записи, следуя этим рекомендациям.</string>
@@ -2693,4 +2693,53 @@
<string name="home_empty_no_rooms_title">Добро пожаловать в ${app_name},
\n%s.</string>
<string name="onboarding_new_app_layout_feedback_title">Оставить отзыв</string>
-</resources>
+ <string name="device_manager_session_details_session_name">Название сессии</string>
+ <string name="device_manager_filter_option_inactive">Неактивные</string>
+ <string name="device_manager_session_details_device_ip_address">IP-адрес</string>
+ <string name="device_manager_session_details_session_last_activity">Последняя активность</string>
+ <string name="device_manager_session_details_title">Сведения о сессии</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">Для лучшей безопасности выйдите из всех сессий, которые более не признаёте или не используете.</string>
+ <string name="device_manager_filter_option_verified">Заверенные</string>
+ <string name="device_manager_filter_option_all_sessions">Все сессии</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>
+ <string name="device_manager_verify_session">Заверить сессию</string>
+ <string name="device_manager_view_details">Подробности</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Эта сессия готова к безопасному обмену сообщениями.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Текущая сессия готова к безопасному обмену сообщениями.</string>
+ <string name="a11y_device_manager_device_type_web">Веб-браузер</string>
+ <string name="space_list_empty_message">Пространства — это новый способ организации комнат и людей. Создайте пространство, чтобы начать.</string>
+ <string name="labs_enable_new_app_layout_title">Новый вид</string>
+ <string name="home_empty_no_unreads_title">Нечего отображать.</string>
+ <string name="home_empty_no_unreads_message">Здесь будут отображаться непрочитанные сообщения, когда таковые будут.</string>
+ <string name="font_size_use_system">Присущий системе</string>
+ <string name="change_space">Смена пространства</string>
+ <string name="labs_enable_new_app_layout_summary">Упрощённый Element с дополнительными вкладками</string>
+ <string name="onboarding_new_app_layout_welcome_title">Добро пожаловать в новый вид!</string>
+ <string name="home_empty_space_no_rooms_title">%s
+\nвыглядит слегка пустовато.</string>
+ <string name="onboarding_new_app_layout_button_try">Попробовать</string>
+ <string name="device_manager_session_details_description">Сведения о приложении, устройстве и активности.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Подтвердите текущую сессию для более безопасного обмена сообщениями.</string>
+ <string name="space_list_empty_title">Пока нет пространств.</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Подтвердите свои сессии для более безопасного обмена сообщениями или выйдите из тех, которые более не признаёте или не используете.</string>
+ <string name="device_manager_unverified_sessions_description">Подтвердите или выйдите из незаверенных сессий.</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Подтвердите или выйдите из этой сессии для лучшей безопасности и надёжности.</string>
+ <string name="invites_empty_title">Ничего нового.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Заверенных сессий не обнаружено.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Незаверенных сессий не обнаружено.</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Неактивных сессий не обнаружено.</string>
+ <string name="device_manager_other_sessions_clear_filter">Очистить фильтр</string>
+ <string name="device_manager_filter_option_unverified_description">Не готовы к безопасному обмену сообщениями</string>
+ <string name="device_manager_filter_option_verified_description">Готовы к безопасному обмену сообщениями</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <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="device_manager_filter_option_unverified">Незаверенные</string>
+ <string name="device_manager_filter_bottom_sheet_title">Фильтр</string>
+</resources>
\ No newline at end of file
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 9eb22e3ae3..f37af1a654 100644
--- a/library/ui-strings/src/main/res/values-sk/strings.xml
+++ b/library/ui-strings/src/main/res/values-sk/strings.xml
@@ -2720,4 +2720,48 @@
<string name="a11y_collapse_space_children">Zbaliť %s podpriestory</string>
<string name="a11y_expand_space_children">Rozbaliť %s podpriestory</string>
<string name="change_space">Zmeniť priestor</string>
-</resources>
+ <string name="device_manager_session_details_device_ip_address">IP adresa</string>
+ <string name="device_manager_session_details_session_last_activity">Posledná aktivita</string>
+ <string name="device_manager_session_details_session_name">Názov relácie</string>
+ <string name="device_manager_session_details_description">Informácie o aplikácii, zariadení a činnosti.</string>
+ <string name="device_manager_session_details_title">Podrobnosti o relácii</string>
+ <string name="device_manager_other_sessions_clear_filter">Zrušiť filter</string>
+ <string name="device_manager_other_sessions_no_inactive_sessions_found">Nenašli sa žiadne neaktívne relácie.</string>
+ <string name="device_manager_other_sessions_no_unverified_sessions_found">Nenašli sa žiadne neoverené relácie.</string>
+ <string name="device_manager_other_sessions_no_verified_sessions_found">Nenašli sa žiadne overené relácie.</string>
+ <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+ <item quantity="one">Zvážte odhlásenie zo starých relácií (%1$d deň alebo viac), ktoré už nepoužívate.</item>
+ <item quantity="few">Zvážte odhlásenie zo starých relácií (%1$d dni alebo viac), ktoré už nepoužívate.</item>
+ <item quantity="other">Zvážte odhlásenie zo starých relácií (%1$d dní alebo viac), ktoré už nepoužívate.</item>
+ </plurals>
+ <string name="device_manager_other_sessions_recommendation_title_inactive">Neaktívne</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Overte si relácie pre vylepšené bezpečné zasielanie správ alebo sa odhláste z tých, ktoré už nepoznáte alebo nepoužívate.</string>
+ <string name="device_manager_other_sessions_recommendation_title_unverified">Neoverené</string>
+ <string name="device_manager_other_sessions_recommendation_description_verified">V záujme čo najlepšieho zabezpečenia sa odhláste z každej relácie, ktorú už nepoznáte alebo nepoužívate.</string>
+ <string name="device_manager_other_sessions_recommendation_title_verified">Overené</string>
+ <string name="a11y_device_manager_filter">Filter</string>
+ <plurals name="device_manager_filter_option_inactive_description">
+ <item quantity="one">Neaktívny už %1$d deň alebo dlhšie</item>
+ <item quantity="few">Neaktívny už %1$d dni alebo dlhšie</item>
+ <item quantity="other">Neaktívny už %1$d dní alebo dlhšie</item>
+ </plurals>
+ <string name="device_manager_filter_option_inactive">Neaktívne</string>
+ <string name="device_manager_filter_option_unverified_description">Nie je pripravené na bezpečné zasielanie správ</string>
+ <string name="device_manager_filter_option_unverified">Neoverené</string>
+ <string name="device_manager_filter_option_verified_description">Pripravené na bezpečné zasielanie správ</string>
+ <string name="device_manager_filter_option_verified">Overené</string>
+ <string name="device_manager_filter_option_all_sessions">Všetky relácie</string>
+ <string name="device_manager_filter_bottom_sheet_title">Filter</string>
+ <string name="device_manager_session_last_activity">Posledná aktivita %1$s</string>
+ <string name="device_manager_device_title">Zariadenie</string>
+ <string name="device_manager_session_title">Relácia</string>
+ <string name="device_manager_current_session_title">Aktuálna relácia</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">V záujme čo najvyššej bezpečnosti a spoľahlivosti túto reláciu overte alebo sa z nej odhláste.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Overte svoju aktuálnu reláciu pre vylepšené bezpečné zasielanie správ.</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Táto relácia je pripravená na bezpečné zasielanie správ.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Vaša aktuálna relácia je pripravená na bezpečné zasielanie správ.</string>
+ <string name="labs_enable_deferred_dm_summary">Vytvoriť priamu správu len pri prvej správe</string>
+ <string name="labs_enable_deferred_dm_title">Povoliť odložené priame správy</string>
+ <string name="labs_enable_new_app_layout_summary">Zjednodušený Element s voliteľnými kartami</string>
+ <string name="labs_enable_new_app_layout_title">Zapnúť nové usporiadanie</string>
+</resources>
\ No newline at end of file
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 3e511f8459..c4f1658f6b 100644
--- a/library/ui-strings/src/main/res/values-uk/strings.xml
+++ b/library/ui-strings/src/main/res/values-uk/strings.xml
@@ -818,7 +818,7 @@
<string name="room_widget_permission_avatar_url">URL-адреса аватара</string>
<string name="room_widget_permission_display_name">Ваше показуване ім\'я</string>
<string name="room_widget_revoke_access">Скасувати доступ для мене</string>
- <string name="room_widget_open_in_browser">Відкрити в переглядачі</string>
+ <string name="room_widget_open_in_browser">Відкрити у браузері</string>
<string name="room_widget_reload">Перезавантажити віджет</string>
<string name="room_widget_failed_to_load">Не вдалося завантажити віджет.
\n%s</string>
@@ -1196,7 +1196,7 @@
<string name="use_file">Використати файл</string>
<string name="verification_cannot_access_other_session">Скористатись парольною фразою відновлення або ключем</string>
<string name="keys_backup_restore_with_passphrase">Скористатись відновлювальними парольною фразою або ключем</string>
- <string name="use_other_session_content_description">Використовуйте найостаннішій ${app_name} на ваших інших пристроях, ${app_name} Web, ${app_name} для комп\'ютерів, ${app_name} iOS, ${app_name} для Android, або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
+ <string name="use_other_session_content_description">Використовуйте найостаннішій ${app_name} на ваших інших пристроях, ${app_name} браузері, ${app_name} комп\'ютерах, ${app_name} iOS, ${app_name} Android, або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
<string name="use_latest_app">Використовуйте найостаннішій ${app_name} на ваших інших пристроях:</string>
<string name="verification_use_passphrase">Якщо ви не можете доступитись до чинного сеансу</string>
<string name="verification_open_other_to_verify">Використайте чинний сеанс, щоб звірити цей сеанс, таким чином надавши йому доступ до зашифрованих повідомлень.</string>
@@ -2021,7 +2021,7 @@
<string name="failed_to_access_secure_storage">Не вдалося отримати доступ до безпечного сховища</string>
<string name="app_ios_android">${app_name} iOS
\n${app_name} Android</string>
- <string name="app_desktop_web">${app_name} для переглядача
+ <string name="app_desktop_web">${app_name} для браузера
\n${app_name} для ПК</string>
<string name="error_saving_media_file">Не вдалося зберегти медіафайл</string>
<string name="bootstrap_invalid_recovery_key">Це не дійсний ключ відновлення</string>
@@ -2701,7 +2701,7 @@
<string name="a11y_open_settings">Відкрити налаштування</string>
<string name="all_chats">Усі бесіди</string>
<string name="device_manager_settings_active_sessions_show_all">Показати всі сеанси (V2, WIP)</string>
- <string name="device_manager_sessions_other_description">Для найкращої безпеки перевірте свої сеанси та вийдіть з усіх сеансів, які ви більше не розпізнаєте або не використовуєте.</string>
+ <string name="device_manager_sessions_other_description">Звірте свої сеанси та вийдіть з усіх сеансів, які ви більше не розпізнаєте або не використовуєте для кращої безпеки.</string>
<string name="device_manager_sessions_other_title">Інші сеанси</string>
<string name="settings_sessions_list">Сеанси</string>
<string name="a11y_open_spaces">Відкрити список кімнат</string>
@@ -2772,4 +2772,50 @@
<string name="a11y_collapse_space_children">Згорнути дочірні елементи %s</string>
<string name="a11y_expand_space_children">Розгорнути дочірні елементи %s</string>
<string name="change_space">Змінити простір</string>
-</resources>
+ <string name="device_manager_session_details_device_ip_address">IP-адреса</string>
+ <string name="device_manager_session_details_session_last_activity">Остання активність</string>
+ <string name="device_manager_session_details_session_name">Назва сеансу</string>
+ <string name="device_manager_session_details_description">Відомості про застосунок, пристрій та діяльність.</string>
+ <string name="device_manager_session_details_title">Подробиці сеансу</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="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="device_manager_other_sessions_recommendation_title_inactive">Неактивний</string>
+ <string name="device_manager_other_sessions_recommendation_description_unverified">Звірте свої сеанси для посилення безпеки обміну повідомленнями або вийдіть з тих, які ви більше не впізнаєте або не використовуєте.</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="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="device_manager_filter_option_inactive">Неактивний</string>
+ <string name="device_manager_filter_option_unverified_description">Не готовий до безпечного обміну повідомленнями</string>
+ <string name="device_manager_filter_option_unverified">Не звірений</string>
+ <string name="device_manager_filter_option_verified">Звірений</string>
+ <string name="device_manager_filter_option_verified_description">Готовий до безпечного обміну повідомленнями</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_device_title">Пристрій</string>
+ <string name="device_manager_session_title">Сеанс</string>
+ <string name="device_manager_current_session_title">Поточний сеанс</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">Звірте або вийдіть з цього сеансу для кращої безпеки та надійності.</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">Звірте свій поточний сеанс для посилення безпеки обміну повідомленнями.</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">Цей сеанс готовий до безпечного обміну повідомленнями.</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">Ваш поточний сеанс готовий до безпечного обміну повідомленнями.</string>
+ <string name="labs_enable_deferred_dm_summary">Створюйте приватні повідомлення лише за надсилання першого повідомлення</string>
+ <string name="labs_enable_deferred_dm_title">Увімкнути відкладені приватні повідомлення</string>
+ <string name="labs_enable_new_app_layout_summary">Спрощений Element з опціональними вкладками</string>
+ <string name="labs_enable_new_app_layout_title">Увімкнути новий вигляд</string>
+</resources>
\ No newline at end of file
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 db1dab92e2..eba96e82c3 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
@@ -2604,4 +2604,24 @@
<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>
-</resources>
+ <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_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_device_title">设备</string>
+ <string name="device_manager_session_title">会话</string>
+ <string name="device_manager_current_session_title">当前会话</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">验证你的会话以增强消息传输的安全性。</string>
+ <string name="onboarding_new_app_layout_spaces_message">访问你的空间（右下角）比以前更快、更容易。</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">此会话已准备好安全地收发消息。</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">你当前的会话已准备好安全地收发消息。</string>
+ <string name="labs_enable_deferred_dm_summary">仅在首条消息创建私聊消息</string>
+ <string name="labs_enable_deferred_dm_title">启用延迟的私聊消息</string>
+ <string name="labs_enable_new_app_layout_summary">简化的Element，带有可选的标签</string>
+</resources>
\ No newline at end of file
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 78caa2cc2e..876084d566 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
@@ -2616,4 +2616,44 @@
<string name="a11y_collapse_space_children">折疊 %s 個子空間</string>
<string name="a11y_expand_space_children">展開 %s 個子空間</string>
<string name="change_space">變更空間</string>
-</resources>
+ <string name="device_manager_session_details_device_ip_address">IP 位置</string>
+ <string name="device_manager_session_details_session_last_activity">最後活動</string>
+ <string name="device_manager_session_details_session_name">工作階段名稱</string>
+ <string name="device_manager_session_details_description">應用程式、裝置與活動資訊。</string>
+ <string name="device_manager_session_details_title">工作階段詳細資訊</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_filter_option_inactive_description">
+ <item quantity="other">閒置%1$d天或更久</item>
+ </plurals>
+ <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_description_unverified">驗證您的工作階段以強化安全通訊或從您無法識別或不再使用的工作階段登出。</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>
+ <string name="device_manager_filter_option_inactive">不活躍</string>
+ <string name="device_manager_filter_option_unverified_description">尚未準備好安全通訊</string>
+ <string name="device_manager_filter_option_unverified">未驗證</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_device_title">裝置</string>
+ <string name="device_manager_session_title">工作階段</string>
+ <string name="device_manager_current_session_title">目前的工作階段</string>
+ <string name="device_manager_verification_status_detail_other_session_unverified">驗證或從此工作階段登出以取得最佳安全性與可靠性。</string>
+ <string name="device_manager_verification_status_detail_current_session_unverified">驗證您目前的工作階段以強化安全通訊。</string>
+ <string name="device_manager_verification_status_detail_other_session_verified">此工作階段已準備好安全通訊。</string>
+ <string name="device_manager_verification_status_detail_current_session_verified">您目前的工作階段已準備好安全通訊。</string>
+ <string name="labs_enable_deferred_dm_summary">僅在第一則訊息上建立直接訊息</string>
+ <string name="labs_enable_deferred_dm_title">啟用延期直接訊息</string>
+ <string name="labs_enable_new_app_layout_summary">包含選擇性分頁的簡潔 Element</string>
+ <string name="labs_enable_new_app_layout_title">啟用新佈局</string>
+</resources>
\ No newline at end of file
diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 4ff7aae750..71ccf5b234 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -284,8 +284,8 @@
<string name="notice_end_to_end_ok">%1$s turned on end-to-end encryption.</string>
<string name="notice_end_to_end_ok_by_you">You turned on end-to-end encryption.</string>
- <string name="notice_end_to_end_unknown_algorithm">%1$s turned on end-to-end encryption (unrecognised algorithm %2$s).</string>
- <string name="notice_end_to_end_unknown_algorithm_by_you">You turned on end-to-end encryption (unrecognised algorithm %1$s).</string>
+ <string name="notice_end_to_end_unknown_algorithm">%1$s turned on end-to-end encryption (unrecognized algorithm %2$s).</string>
+ <string name="notice_end_to_end_unknown_algorithm_by_you">You turned on end-to-end encryption (unrecognized algorithm %1$s).</string>
<!-- theme -->
<string name="system_theme">System Default</string>
@@ -406,6 +406,7 @@
<string name="action_reset">Reset</string>
<string name="action_learn_more">Learn more</string>
<string name="action_next">Next</string>
+ <string name="action_got_it">Got it</string>
<string name="copied_to_clipboard">Copied to clipboard</string>
@@ -423,7 +424,7 @@
<!-- Bottom navigation buttons -->
<string name="bottom_action_notification">Notifications</string>
- <string name="bottom_action_favourites">Favourites</string>
+ <string name="bottom_action_favourites">Favorites</string>
<string name="bottom_action_people">People</string>
<string name="bottom_action_rooms">Rooms</string>
@@ -773,7 +774,7 @@
<string name="thread_list_modal_all_threads_subtitle">Shows all threads from current room</string>
<string name="thread_list_modal_my_threads_title">My Threads</string>
<string name="thread_list_modal_my_threads_subtitle">Shows all threads you’ve participated in</string>
- <string name="thread_list_empty_title">Keep discussions organised with threads</string>
+ <string name="thread_list_empty_title">Keep discussions organized with threads</string>
<string name="thread_list_empty_subtitle">Threads help keep your conversations on-topic and easy to track.</string>
<!-- Parameter %s will be replaced by the value of string reply_in_thread -->
<string name="thread_list_empty_notice">Tip: Long tap a message and use “%s”.</string>
@@ -818,7 +819,7 @@
<string name="settings_app_info_link_summary">Show the application info in the system settings.</string>
<string name="settings_emails">Email addresses</string>
- <string name="settings_emails_empty">No email has been added to your account</string>
+ <string name="settings_emails_empty">No email address has been added to your account</string>
<string name="settings_phone_numbers">Phone numbers</string>
<string name="settings_remove_three_pid_confirmation_content">Remove %s?</string>
<string name="error_threepid_auth_failed">Ensure that you have clicked on the link in the email we have sent to you.</string>
@@ -827,7 +828,7 @@
<string name="settings_notification_by_event">Notification importance by event</string>
<string name="settings_notification_emails_category">Email notification</string>
- <string name="settings_notification_emails_no_emails">To receive email with notification, please associate an email to your Matrix account</string>
+ <string name="settings_notification_emails_no_emails">To receive email with notification, please associate an email address to your Matrix account</string>
<!-- The variable is a single email address, eg Enable email notifications for example@matrix.org -->
<string name="settings_notification_emails_enable_for_email">Enable email notifications for %s</string>
@@ -1093,7 +1094,7 @@
<string name="settings_unignore_user">Show all messages from %s?</string>
<string name="settings_emails_and_phone_numbers_title">Emails and phone numbers</string>
- <string name="settings_emails_and_phone_numbers_summary">Manage emails and phone numbers linked to your Matrix account</string>
+ <string name="settings_emails_and_phone_numbers_summary">Manage email addresses and phone numbers linked to your Matrix account</string>
<string name="settings_select_country">Choose a country</string>
@@ -1233,6 +1234,9 @@
<string name="encryption_import_import">Import</string>
<string name="encryption_never_send_to_unverified_devices_title">Encrypt to verified sessions only</string>
<string name="encryption_never_send_to_unverified_devices_summary">Never send encrypted messages to unverified sessions from this session.</string>
+ <string name="encryption_never_send_to_unverified_devices_in_room">Never send encrypted messages to unverified sessions in this room.</string>
+ <string name="some_devices_will_not_be_able_to_decrypt">⚠ There are unverified devices in this room, they won’t be able to decrypt messages you send.</string>
+ <string name="room_settings_global_block_unverified_info_text">🔒 You have enabled encrypt to verified sessions only for all rooms in Security Settings.</string>
<plurals name="encryption_import_room_keys_success">
<item quantity="one">%1$d/%2$d key imported with success.</item>
<item quantity="other">%1$d/%2$d keys imported with success.</item>
@@ -1641,7 +1645,7 @@
<string name="room_list_filter_all">All</string>
<string name="room_list_filter_unreads">Unreads</string>
- <string name="room_list_filter_favourites">Favourites</string>
+ <string name="room_list_filter_favourites">Favorites</string>
<string name="room_list_filter_people">People</string>
<string name="title_activity_emoji_reaction_picker">Reactions</string>
@@ -1800,20 +1804,20 @@
<string name="settings_discovery_identity_server_info">You are currently using %1$s to discover and be discoverable by existing contacts you know.</string>
<string name="settings_discovery_identity_server_info_none">You are not currently using an identity server. To discover and be discoverable by existing contacts you know, configure one below.</string>
<string name="settings_discovery_emails_title">Discoverable email addresses</string>
- <string name="settings_discovery_no_mails">Discovery options will appear once you have added an email.</string>
+ <string name="settings_discovery_no_mails">Discovery options will appear once you have added an email address.</string>
<string name="settings_discovery_no_msisdn">Discovery options will appear once you have added a phone number.</string>
<string name="settings_discovery_disconnect_identity_server_info">Disconnecting from your identity server will mean you won’t be discoverable by other users and you won’t be able to invite others by email or phone.</string>
<string name="settings_discovery_msisdn_title">Discoverable phone numbers</string>
- <string name="settings_discovery_confirm_mail">We sent you a confirm email to %s, check your email and click on the confirmation link</string>
- <string name="settings_discovery_confirm_mail_not_clicked">We sent you a confirm email to %s, please first check your email and click on the confirmation link</string>
+ <string name="settings_discovery_confirm_mail">We sent an email to %s, check your email and click on the confirmation link</string>
+ <string name="settings_discovery_confirm_mail_not_clicked">We sent an email to %s, please first check your email and click on the confirmation link</string>
<string name="settings_discovery_consent_title">Send emails and phone numbers</string>
- <string name="settings_discovery_consent_notice_on">You have given your consent to send emails and phone numbers to this identity server to discover other users from your contacts.</string>
+ <string name="settings_discovery_consent_notice_on">You have given your consent to send email addresses and phone numbers to this identity server to discover other users from your contacts.</string>
<string name="settings_discovery_consent_notice_off_2">Your contacts are private. To discover users from your contacts, we need your permission to send contact info to your identity server.</string>
<string name="settings_discovery_consent_action_revoke">Revoke my consent</string>
<string name="settings_discovery_consent_action_give_consent">Give consent</string>
- <string name="identity_server_consent_dialog_title_2">Send emails and phone numbers to %s</string>
- <string name="identity_server_consent_dialog_content_3">To discover existing contacts, you need to send contact info (emails and phone numbers) to your identity server. We hash your data before sending for privacy.</string>
+ <string name="identity_server_consent_dialog_title_2">Send email addresses and phone numbers to %s</string>
+ <string name="identity_server_consent_dialog_content_3">To discover existing contacts, you need to send contact info (email addresses and phone numbers) to your identity server. We hash your data before sending for privacy.</string>
<string name="identity_server_consent_dialog_content_question">Do you agree to send this info?</string>
<string name="settings_discovery_enter_identity_server">Enter an identity server URL</string>
@@ -1843,7 +1847,7 @@
<string name="a11y_create_menu_close">Close the create room menu…</string>
<string name="a11y_create_direct_message">Create a new direct conversation</string>
<string name="a11y_create_message">Create a new conversation or room</string>
- <string name="a11y_create_room">Create a new room</string> <!-- TODO TO BE REMOVED -->
+ <string name="a11y_create_room">Create a new room</string>
<string name="a11y_open_spaces">Open spaces list</string>
<string name="a11y_close_keys_backup_banner">Close keys backup banner</string>
<string name="a11y_jump_to_bottom">Jump to bottom</string>
@@ -1871,6 +1875,7 @@
<string name="attachment_type_sticker">"Sticker"</string>
<string name="attachment_type_poll">Poll</string>
<string name="attachment_type_location">Location</string>
+ <string name="attachment_type_voice_broadcast">Voice Broadcast</string>
<string name="rotate_and_crop_screen_title">Rotate and crop</string>
<string name="error_handling_incoming_share">Couldn\'t handle share data</string>
@@ -2037,7 +2042,7 @@
<string name="login_splash_title">It\'s your conversation. Own it.</string>
<string name="login_splash_text1">Chat with people directly or in groups</string>
<string name="login_splash_text2">Keep conversations private with encryption</string>
- <string name="login_splash_text3">Extend & customise your experience</string>
+ <string name="login_splash_text3">Extend & customize your experience</string>
<string name="login_splash_submit">Get started</string>
<string name="login_splash_create_account">Create account</string>
<string name="login_splash_already_have_account">I already have an account</string>
@@ -2080,7 +2085,7 @@
<string name="login_registration_disabled">Sorry, this server isn’t accepting new accounts.</string>
<string name="login_registration_not_supported">The application is not able to create an account on this homeserver.\n\nDo you want to signup using a web client?</string>
- <string name="login_login_with_email_error">This email is not associated to any account.</string>
+ <string name="login_login_with_email_error">This email address is not associated to any account.</string>
<!-- Replaced string is the homeserver url -->
<string name="login_reset_password_on">Reset password on %1$s</string>
@@ -2093,7 +2098,7 @@
<string name="login_reset_password_warning_content">Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.</string>
<string name="login_reset_password_warning_submit">Continue</string>
- <string name="login_reset_password_error_not_found">This email is not linked to any account</string>
+ <string name="login_reset_password_error_not_found">This email address is not linked to any account</string>
<string name="login_reset_password_mail_confirmation_title">Check your inbox</string>
<!-- Replaced string is an email -->
@@ -2110,7 +2115,7 @@
<string name="login_reset_password_cancel_confirmation_content">Your password is not yet changed.\n\nStop the password change process?</string>
<string name="login_set_email_title">Set email address</string>
- <string name="login_set_email_notice">Set an email to recover your account. Later, you can optionally allow people you know to discover you by your email.</string>
+ <string name="login_set_email_notice">Set an email address to recover your account. Later, you can optionally allow people you know to discover you by your this address.</string>
<string name="login_set_email_mandatory_hint">Email</string>
<string name="login_set_email_optional_hint">Email (optional)</string>
<string name="login_set_email_submit">Next</string>
@@ -2261,8 +2266,8 @@
<string name="sent_live_location">Shared their live location</string>
<string name="verification_request_waiting">Waiting…</string>
- <string name="verification_request_other_cancelled">%s cancelled</string>
- <string name="verification_request_you_cancelled">You cancelled</string>
+ <string name="verification_request_other_cancelled">%s canceled</string>
+ <string name="verification_request_you_cancelled">You canceled</string>
<string name="verification_request_other_accepted">%s accepted</string>
<string name="verification_request_you_accepted">You accepted</string>
<string name="verification_sent">Verification Sent</string>
@@ -2366,9 +2371,6 @@
<string name="settings_active_sessions_manage">Manage Sessions</string>
<string name="settings_active_sessions_signout_device">Sign out of this session</string>
<string name="settings_sessions_list">Sessions</string>
- <string name="device_manager_sessions_other_title">Other sessions</string>
- <string name="device_manager_sessions_other_description">For best security, verify your sessions and sign out from any session that you don’t recognize or use anymore.</string>
-
<string name="settings_server_name">Server name</string>
<string name="settings_server_version">Server version</string>
<string name="settings_server_upload_size_title">Server file upload limit</string>
@@ -2407,7 +2409,7 @@
<string name="verification_profile_device_verified_because">This session is trusted for secure messaging because %1$s (%2$s) verified it:</string>
<string name="verification_profile_device_new_signing">%1$s (%2$s) signed in using a new session:</string>
- <string name="verification_profile_device_untrust_info">Until this user trusts this session, messages sent to and from it are labelled with warnings. Alternatively, you can manually verify it.</string>
+ <string name="verification_profile_device_untrust_info">Until this user trusts this session, messages sent to and from it are labeled with warnings. Alternatively, you can manually verify it.</string>
<string name="initialize_cross_signing">Initialize CrossSigning</string>
@@ -2476,9 +2478,9 @@
One of the following may be compromised:\n\n- Your password\n- Your homeserver\n- This device, or the other device\n- The internet connection either device is using\n\nWe recommend you change your password & recovery key in Settings immediately.
</string>
- <string name="verify_cancelled_notice">Verification has been cancelled. You can start verification again.</string>
+ <string name="verify_cancelled_notice">Verification has been canceled. You can start verification again.</string>
<string name="verify_invalid_qr_notice">This QR code looks malformed. Please try to verify with another method.</string>
- <string name="verification_cancelled">Verification Cancelled</string>
+ <string name="verification_cancelled">Verification Canceled</string>
<string name="recovery_passphrase">Recovery Passphrase</string>
<string name="message_key">Message Key</string>
@@ -2579,6 +2581,9 @@
<string name="settings_security_prevent_screenshots_title">Prevent screenshots of the application</string>
<string name="settings_security_prevent_screenshots_summary">Enabling this setting adds the FLAG_SECURE to all Activities. Restart the application for the change to take effect.</string>
+ <string name="settings_security_incognito_keyboard_title">Incognito keyboard</string>
+ <string name="settings_security_incognito_keyboard_summary">"Request that the keyboard should not update any personalized data such as typing history and dictionary based on what you've typed in conversations. Notice that some keyboards may not respect this setting."</string>
+
<string name="error_saving_media_file">Could not save media file</string>
<string name="change_password_summary">Set a new account password…</string>
@@ -2675,7 +2680,7 @@
<string name="identity_server_error_no_identity_server_configured">Please first configure an identity server.</string>
<string name="identity_server_error_terms_not_signed">Please first accepts the terms of the identity server in the settings.</string>
<!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
- <string name="identity_server_error_bulk_sha256_not_supported">For your privacy, ${app_name} only supports sending hashed user emails and phone number.</string>
+ <string name="identity_server_error_bulk_sha256_not_supported">For your privacy, ${app_name} only supports sending hashed user email addresses and phone numbers.</string>
<string name="identity_server_error_binding_error">The association has failed.</string>
<string name="identity_server_error_no_current_binding_error">There is no current association with this identifier.</string>
<string name="identity_server_user_consent_not_provided">The user consent has not been provided.</string>
@@ -2914,7 +2919,7 @@
<string name="create_spaces_who_are_you_working_with">Who are you working with?</string>
<string name="create_spaces_make_sure_access">Make sure the right people have access to %s.</string>
<string name="create_spaces_just_me">Just me</string>
- <string name="create_spaces_organise_rooms">A private space to organise your rooms</string>
+ <string name="create_spaces_organise_rooms">A private space to organize your rooms</string>
<string name="create_spaces_me_and_teammates">Me and teammates</string>
<string name="create_spaces_private_teammates">A private space for you & your teammates</string>
<string name="space_type_public">Public</string>
@@ -3072,7 +3077,7 @@
<!-- %s will be replaced by an email at runtime -->
<string name="this_invite_to_this_space_was_sent">This invite to this space was sent to %s which is not associated with your account</string>
- <string name="link_this_email_settings_link">Link this email with your account</string>
+ <string name="link_this_email_settings_link">Link this email address with your account</string>
<!-- %s will be replaced by the value of link_this_email_settings_link and styled as a link -->
<string name="link_this_email_with_your_account">%s in Settings to receive invites directly in ${app_name}.</string>
@@ -3179,6 +3184,7 @@
<string name="tooltip_attachment_contact">Open contacts</string>
<string name="tooltip_attachment_poll">Create poll</string>
<string name="tooltip_attachment_location">Share location</string>
+ <string name="tooltip_attachment_voice_broadcast">Start a voice broadcast</string>
<string name="message_reaction_show_less">Show less</string>
<plurals name="message_reaction_show_more">
@@ -3229,6 +3235,8 @@
<!-- Device Manager -->
<string name="device_manager_settings_active_sessions_show_all">Show All Sessions (V2, WIP)</string>
+ <string name="device_manager_sessions_other_title">Other sessions</string>
+ <string name="device_manager_sessions_other_description">For best security, verify your sessions and sign out from any session that you don’t recognize or use anymore.</string>
<string name="a11y_device_manager_device_type_mobile">Mobile</string>
<string name="a11y_device_manager_device_type_web">Web</string>
<string name="a11y_device_manager_device_type_desktop">Desktop</string>
@@ -3302,6 +3310,14 @@
<string name="device_manager_session_rename_edit_hint">Session name</string>
<string name="device_manager_session_rename_description">Custom session names can help you recognize your devices more easily.</string>
<string name="device_manager_session_rename_warning">Please be aware that session names are also visible to people you communicate with.</string>
+ <string name="device_manager_learn_more_sessions_inactive_title">Inactive sessions</string>
+ <string name="device_manager_learn_more_sessions_inactive">Inactive sessions are sessions you have not used in some time, but they continue to receive encryption keys.\n\nRemoving inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious.</string>
+ <string name="device_manager_learn_more_sessions_unverified_title">Unverified sessions</string>
+ <string name="device_manager_learn_more_sessions_unverified">Unverified sessions are sessions that have logged in with your credentials but not been cross-verified.\n\nYou should make especially certain that you recognise these sessions as they could represent an unauthorised use of your account.</string>
+ <string name="device_manager_learn_more_sessions_verified_title">Verified sessions</string>
+ <string name="device_manager_learn_more_sessions_verified">Verified sessions have logged in with your credentials and then been verified, either using your secure passphrase or by cross-verifying.\n\nThis means they hold encryption keys for your previous messages, and confirm to other users you are communicating with that these sessions are really you.</string>
+ <string name="device_manager_learn_more_session_rename_title">Renaming sessions</string>
+ <string name="device_manager_learn_more_session_rename">Other users in direct messages and rooms that you join are able to view a full list of your sessions.\n\nThis provides them with confidence that they are really speaking to you, but it also means they can see the session name you enter here.</string>
<!-- Note to translators: %s will be replaces with selected space name -->
<string name="home_empty_space_no_rooms_title">%s\nis looking a little empty.</string>
diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index 758dd6e978..0fb03f0ea3 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -50,9 +50,9 @@
<dimen name="chat_bubble_margin_start">28dp</dimen>
- <dimen name="chat_bubble_margin_end">62dp</dimen>
- <dimen name="chat_bubble_fixed_size">300dp</dimen>
- <dimen name="chat_bubble_corner_radius">12dp</dimen>
+ <dimen name="chat_bubble_margin_end">6dp</dimen>
+ <dimen name="chat_bubble_fixed_size">350sp</dimen>
+ <dimen name="chat_bubble_corner_radius">8dp</dimen>
<!-- Onboarding -->
<item name="ftue_auth_gutter_start_percent" format="float" type="dimen">0.05</item>
diff --git a/library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml b/library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
index d3b931e44a..098ec263fc 100644
--- a/library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
+++ b/library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
@@ -4,6 +4,7 @@
<declare-styleable name="SessionsListHeaderView">
<attr name="sessionsListHeaderTitle" format="string" />
<attr name="sessionsListHeaderDescription" format="string" />
+ <attr name="sessionsListHeaderHasLearnMoreLink" format="boolean" />
</declare-styleable>
</resources>
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index 7b5ee97ae4..74292daf15 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -313,7 +313,7 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
val incomingRequest = bobVerificationService.getExistingVerificationRequests(alice.myUserId).first {
it.requestInfo?.fromDevice == alice.sessionParams.deviceId
}
- bobVerificationService.readyPendingVerification(listOf(VerificationMethod.SAS), alice.myUserId, incomingRequest.transactionId!!)
+ bobVerificationService.readyPendingVerificationInDMs(listOf(VerificationMethod.SAS), alice.myUserId, roomId, incomingRequest.transactionId!!)
var requestID: String? = null
// wait for it to be readied
@@ -365,7 +365,7 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
}
testHelper.retryPeriodically {
- alice.cryptoService().crossSigningService().isUserTrusted(bob.myUserId)
+ bob.cryptoService().crossSigningService().isUserTrusted(alice.myUserId)
}
}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt
new file mode 100644
index 0000000000..8b12092b79
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt
@@ -0,0 +1,132 @@
+/*
+ * 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.crypto
+
+import androidx.test.filters.LargeTest
+import org.amshove.kluent.shouldBe
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+@LargeTest
+class E2eeConfigTest : InstrumentedTest {
+
+ @Test
+ fun testBlacklistUnverifiedDefault() = runCryptoTest(context()) { cryptoTestHelper, _ ->
+ val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+ cryptoTestData.firstSession.cryptoService().getGlobalBlacklistUnverifiedDevices() shouldBe false
+ cryptoTestData.firstSession.cryptoService().isRoomBlacklistUnverifiedDevices(cryptoTestData.roomId) shouldBe false
+ cryptoTestData.secondSession!!.cryptoService().getGlobalBlacklistUnverifiedDevices() shouldBe false
+ cryptoTestData.secondSession!!.cryptoService().isRoomBlacklistUnverifiedDevices(cryptoTestData.roomId) shouldBe false
+ }
+
+ @Test
+ fun testCantDecryptIfGlobalUnverified() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+ val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+ cryptoTestData.firstSession.cryptoService().setGlobalBlacklistUnverifiedDevices(true)
+
+ val roomAlicePOV = cryptoTestData.firstSession.roomService().getRoom(cryptoTestData.roomId)!!
+
+ val sentMessage = testHelper.sendTextMessage(roomAlicePOV, "you are blocked", 1).first()
+
+ val roomBobPOV = cryptoTestData.secondSession!!.roomService().getRoom(cryptoTestData.roomId)!!
+ // ensure other received
+ testHelper.retryPeriodically {
+ roomBobPOV.timelineService().getTimelineEvent(sentMessage.eventId) != null
+ }
+
+ cryptoTestHelper.ensureCannotDecrypt(listOf(sentMessage.eventId), cryptoTestData.secondSession!!, cryptoTestData.roomId)
+ }
+
+ @Test
+ fun testCanDecryptIfGlobalUnverifiedAndUserTrusted() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+ val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+ cryptoTestHelper.initializeCrossSigning(cryptoTestData.firstSession)
+ cryptoTestHelper.initializeCrossSigning(cryptoTestData.secondSession!!)
+
+ cryptoTestHelper.verifySASCrossSign(cryptoTestData.firstSession, cryptoTestData.secondSession!!, cryptoTestData.roomId)
+
+ cryptoTestData.firstSession.cryptoService().setGlobalBlacklistUnverifiedDevices(true)
+
+ val roomAlicePOV = cryptoTestData.firstSession.roomService().getRoom(cryptoTestData.roomId)!!
+
+ val sentMessage = testHelper.sendTextMessage(roomAlicePOV, "you can read", 1).first()
+
+ val roomBobPOV = cryptoTestData.secondSession!!.roomService().getRoom(cryptoTestData.roomId)!!
+ // ensure other received
+ testHelper.retryPeriodically {
+ roomBobPOV.timelineService().getTimelineEvent(sentMessage.eventId) != null
+ }
+
+ cryptoTestHelper.ensureCanDecrypt(
+ listOf(sentMessage.eventId),
+ cryptoTestData.secondSession!!,
+ cryptoTestData.roomId,
+ listOf(sentMessage.getLastMessageContent()!!.body)
+ )
+ }
+
+ @Test
+ fun testCantDecryptIfPerRoomUnverified() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+ val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+ val roomAlicePOV = cryptoTestData.firstSession.roomService().getRoom(cryptoTestData.roomId)!!
+
+ val beforeMessage = testHelper.sendTextMessage(roomAlicePOV, "you can read", 1).first()
+
+ val roomBobPOV = cryptoTestData.secondSession!!.roomService().getRoom(cryptoTestData.roomId)!!
+ // ensure other received
+ testHelper.retryPeriodically {
+ roomBobPOV.timelineService().getTimelineEvent(beforeMessage.eventId) != null
+ }
+
+ cryptoTestHelper.ensureCanDecrypt(
+ listOf(beforeMessage.eventId),
+ cryptoTestData.secondSession!!,
+ cryptoTestData.roomId,
+ listOf(beforeMessage.getLastMessageContent()!!.body)
+ )
+
+ cryptoTestData.firstSession.cryptoService().setRoomBlockUnverifiedDevices(cryptoTestData.roomId, true)
+
+ val afterMessage = testHelper.sendTextMessage(roomAlicePOV, "you are blocked", 1).first()
+
+ // ensure received
+ testHelper.retryPeriodically {
+ cryptoTestData.secondSession?.getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(afterMessage.eventId)?.root != null
+ }
+
+ cryptoTestHelper.ensureCannotDecrypt(
+ listOf(afterMessage.eventId),
+ cryptoTestData.secondSession!!,
+ cryptoTestData.roomId,
+ MXCryptoError.ErrorType.KEYS_WITHHELD
+ )
+ }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index 544fe90a73..a36ba8ac02 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -33,6 +33,10 @@ import org.junit.runner.RunWith
import org.junit.runners.JUnit4
import org.junit.runners.MethodSorters
import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.auth.UIABaseAuth
+import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
+import org.matrix.android.sdk.api.auth.UserPasswordAuth
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
import org.matrix.android.sdk.api.crypto.MXCryptoConfig
import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.api.session.crypto.MXCryptoError
@@ -61,7 +65,10 @@ import org.matrix.android.sdk.common.CommonTestHelper
import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
import org.matrix.android.sdk.mustFail
+import timber.log.Timber
+import kotlin.coroutines.Continuation
import kotlin.coroutines.resume
// @Ignore("This test fails with an unhandled exception thrown from a coroutine which terminates the entire test run.")
@@ -607,6 +614,85 @@ class E2eeSanityTests : InstrumentedTest {
)
}
+ @Test
+ fun test_EncryptionDoesNotHinderVerification() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+ val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
+
+ val aliceSession = cryptoTestData.firstSession
+ val bobSession = cryptoTestData.secondSession
+
+ val aliceAuthParams = UserPasswordAuth(
+ user = aliceSession.myUserId,
+ password = TestConstants.PASSWORD
+ )
+ val bobAuthParams = UserPasswordAuth(
+ user = bobSession!!.myUserId,
+ password = TestConstants.PASSWORD
+ )
+
+ testHelper.waitForCallback {
+ aliceSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+ override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+ promise.resume(aliceAuthParams)
+ }
+ }, it)
+ }
+
+ testHelper.waitForCallback {
+ bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+ override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+ promise.resume(bobAuthParams)
+ }
+ }, it)
+ }
+
+ // add a second session for bob but not cross signed
+
+ val secondBobSession = testHelper.logIntoAccount(bobSession.myUserId, SessionTestParams(true))
+
+ aliceSession.cryptoService().setGlobalBlacklistUnverifiedDevices(true)
+
+ // The two bob session should not be able to decrypt any message
+
+ val roomFromAlicePOV = aliceSession.getRoom(cryptoTestData.roomId)!!
+ Timber.v("#TEST: Send a first message that should be withheld")
+ val sentEvent = sendMessageInRoom(testHelper, roomFromAlicePOV, "Hello")!!
+
+ // wait for it to be synced back the other side
+ Timber.v("#TEST: Wait for message to be synced back")
+ testHelper.retryPeriodically {
+ bobSession.roomService().getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(sentEvent) != null
+ }
+
+ testHelper.retryPeriodically {
+ secondBobSession.roomService().getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(sentEvent) != null
+ }
+
+ // bob should not be able to decrypt
+ Timber.v("#TEST: Ensure cannot be decrytped")
+ cryptoTestHelper.ensureCannotDecrypt(listOf(sentEvent), bobSession, cryptoTestData.roomId)
+ cryptoTestHelper.ensureCannotDecrypt(listOf(sentEvent), secondBobSession, cryptoTestData.roomId)
+
+ // let's try to verify, it should work even if bob devices are untrusted
+ Timber.v("#TEST: Do the verification")
+ cryptoTestHelper.verifySASCrossSign(aliceSession, bobSession, cryptoTestData.roomId)
+
+ Timber.v("#TEST: Send a second message, outbound session should have rotated and only bob 1rst session should decrypt")
+
+ val secondEvent = sendMessageInRoom(testHelper, roomFromAlicePOV, "World")!!
+ Timber.v("#TEST: Wait for message to be synced back")
+ testHelper.retryPeriodically {
+ bobSession.roomService().getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(secondEvent) != null
+ }
+
+ testHelper.retryPeriodically {
+ secondBobSession.roomService().getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(secondEvent) != null
+ }
+
+ cryptoTestHelper.ensureCanDecrypt(listOf(secondEvent), bobSession, cryptoTestData.roomId, listOf("World"))
+ cryptoTestHelper.ensureCannotDecrypt(listOf(secondEvent), secondBobSession, cryptoTestData.roomId)
+ }
+
private suspend fun VerificationService.readOldVerificationCodeAsync(scope: CoroutineScope, userId: String): Deferred<String> {
return scope.async {
suspendCancellableCoroutine { continuation ->
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index 2bb04a1faa..c4fb896934 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -25,7 +25,6 @@ import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Assert.fail
import org.junit.FixMethodOrder
-import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.MethodSorters
@@ -42,13 +41,13 @@ import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
import org.matrix.android.sdk.common.SessionTestParams
import org.matrix.android.sdk.common.TestConstants
+import timber.log.Timber
import kotlin.coroutines.Continuation
import kotlin.coroutines.resume
@RunWith(AndroidJUnit4::class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@LargeTest
-@Ignore
class XSigningTest : InstrumentedTest {
@Test
@@ -214,4 +213,104 @@ class XSigningTest : InstrumentedTest {
val result = aliceSession.cryptoService().crossSigningService().checkDeviceTrust(bobUserId, bobSecondDeviceId, null)
assertTrue("Bob second device should be trusted from alice POV", result.isCrossSignedVerified())
}
+
+ @Test
+ fun testWarnOnCrossSigningReset() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+ val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
+
+ val aliceSession = cryptoTestData.firstSession
+ val bobSession = cryptoTestData.secondSession
+
+ val aliceAuthParams = UserPasswordAuth(
+ user = aliceSession.myUserId,
+ password = TestConstants.PASSWORD
+ )
+ val bobAuthParams = UserPasswordAuth(
+ user = bobSession!!.myUserId,
+ password = TestConstants.PASSWORD
+ )
+
+ testHelper.waitForCallback<Unit> {
+ aliceSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+ override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+ promise.resume(aliceAuthParams)
+ }
+ }, it)
+ }
+ testHelper.waitForCallback<Unit> {
+ bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+ override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+ promise.resume(bobAuthParams)
+ }
+ }, it)
+ }
+
+ cryptoTestHelper.verifySASCrossSign(aliceSession, bobSession, cryptoTestData.roomId)
+
+ testHelper.retryPeriodically {
+ aliceSession.cryptoService().crossSigningService().isUserTrusted(bobSession.myUserId)
+ }
+
+ testHelper.retryPeriodically {
+ aliceSession.cryptoService().crossSigningService().checkUserTrust(bobSession.myUserId).isVerified()
+ }
+
+ aliceSession.cryptoService()
+ // Ensure also that bob device is trusted
+ testHelper.retryPeriodically {
+ val deviceInfo = aliceSession.cryptoService().getUserDevices(bobSession.myUserId).firstOrNull()
+ Timber.v("#TEST device:${deviceInfo?.shortDebugString()} trust ${deviceInfo?.trustLevel}")
+ deviceInfo?.trustLevel?.crossSigningVerified == true
+ }
+
+ val currentBobMSK = aliceSession.cryptoService().crossSigningService()
+ .getUserCrossSigningKeys(bobSession.myUserId)!!
+ .masterKey()!!.unpaddedBase64PublicKey!!
+
+ testHelper.waitForCallback<Unit> {
+ bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+ override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+ promise.resume(bobAuthParams)
+ }
+ }, it)
+ }
+
+ testHelper.retryPeriodically {
+ val newBobMsk = aliceSession.cryptoService().crossSigningService()
+ .getUserCrossSigningKeys(bobSession.myUserId)
+ ?.masterKey()?.unpaddedBase64PublicKey
+ newBobMsk != null && newBobMsk != currentBobMSK
+ }
+
+ // trick to force event to sync
+ bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userIsTyping()
+
+ // assert that bob is not trusted anymore from alice s
+ testHelper.retryPeriodically {
+ val trust = aliceSession.cryptoService().crossSigningService().checkUserTrust(bobSession.myUserId)
+ !trust.isVerified()
+ }
+
+ // trick to force event to sync
+ bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userStopsTyping()
+ bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userIsTyping()
+
+ testHelper.retryPeriodically {
+ val info = aliceSession.cryptoService().crossSigningService().getUserCrossSigningKeys(bobSession.myUserId)
+ info?.wasTrustedOnce == true
+ }
+
+ // trick to force event to sync
+ bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userStopsTyping()
+ bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userIsTyping()
+
+ testHelper.retryPeriodically {
+ !aliceSession.cryptoService().crossSigningService().isUserTrusted(bobSession.myUserId)
+ }
+
+ // Ensure also that bob device are not trusted
+ testHelper.retryPeriodically {
+ aliceSession.cryptoService().getUserDevices(bobSession.myUserId).first().trustLevel?.crossSigningVerified != true
+ }
+ }
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
index e0e662c789..d2aa8020e8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
@@ -61,6 +61,8 @@ interface CryptoService {
fun isRoomBlacklistUnverifiedDevices(roomId: String?): Boolean
+ fun getLiveBlockUnverifiedDevices(roomId: String): LiveData<Boolean>
+
fun setWarnOnUnknownDevices(warn: Boolean)
fun setDeviceVerification(trustLevel: DeviceTrustLevel, userId: String, deviceId: String)
@@ -77,6 +79,8 @@ interface CryptoService {
fun setGlobalBlacklistUnverifiedDevices(block: Boolean)
+ fun getLiveGlobalCryptoConfig(): LiveData<GlobalCryptoConfig>
+
/**
* Enable or disable key gossiping.
* Default is true.
@@ -100,7 +104,7 @@ interface CryptoService {
*/
fun isShareKeysOnInviteEnabled(): Boolean
- fun setRoomUnBlacklistUnverifiedDevices(roomId: String)
+ fun setRoomUnBlockUnverifiedDevices(roomId: String)
fun getDeviceTrackingStatus(userId: String): Int
@@ -112,7 +116,7 @@ interface CryptoService {
suspend fun exportRoomKeys(password: String): ByteArray
- fun setRoomBlacklistUnverifiedDevices(roomId: String)
+ fun setRoomBlockUnverifiedDevices(roomId: String, block: Boolean)
fun getCryptoDeviceInfo(userId: String, deviceId: String?): CryptoDeviceInfo?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/GlobalCryptoConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/GlobalCryptoConfig.kt
new file mode 100644
index 0000000000..6405652a68
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/GlobalCryptoConfig.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.api.session.crypto
+
+data class GlobalCryptoConfig(
+ val globalBlockUnverifiedDevices: Boolean,
+ val globalEnableKeyGossiping: Boolean,
+ val enableKeyForwardingOnInvite: Boolean,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
index 9604decd62..30a2cfd719 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
@@ -18,7 +18,8 @@ package org.matrix.android.sdk.api.session.crypto.crosssigning
data class MXCrossSigningInfo(
val userId: String,
- val crossSigningKeys: List<CryptoCrossSigningKey>
+ val crossSigningKeys: List<CryptoCrossSigningKey>,
+ val wasTrustedOnce: Boolean
) {
fun isTrusted(): Boolean = masterKey()?.trustLevel?.isVerified() == true &&
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/DeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/DeviceInfo.kt
index b144069b99..500d016002 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/DeviceInfo.kt
@@ -52,9 +52,17 @@ data class DeviceInfo(
* The last ip address.
*/
@Json(name = "last_seen_ip")
- val lastSeenIp: String? = null
+ val lastSeenIp: String? = null,
+
+ @Json(name = "org.matrix.msc3852.last_seen_user_agent")
+ val unstableLastSeenUserAgent: String? = null,
+
+ @Json(name = "last_seen_user_agent")
+ val lastSeenUserAgent: String? = null,
) : DatedObject {
override val date: Long
get() = lastSeenTs ?: 0
+
+ fun getBestLastSeenUserAgent() = lastSeenUserAgent ?: unstableLastSeenUserAgent
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/UserVerificationLevel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/UserVerificationLevel.kt
new file mode 100644
index 0000000000..e3c7057b6b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/UserVerificationLevel.kt
@@ -0,0 +1,28 @@
+/*
+ * 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.crypto.model
+
+enum class UserVerificationLevel {
+
+ VERIFIED_ALL_DEVICES_TRUSTED,
+
+ VERIFIED_WITH_DEVICES_UNTRUSTED,
+
+ UNVERIFIED_BUT_WAS_PREVIOUSLY,
+
+ WAS_NEVER_VERIFIED,
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index 84c25776e7..3ad4f3a87f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -128,4 +128,17 @@ object EventType {
type == CALL_REJECT ||
type == CALL_REPLACES
}
+
+ fun isVerificationEvent(type: String): Boolean {
+ return when (type) {
+ KEY_VERIFICATION_START,
+ KEY_VERIFICATION_ACCEPT,
+ KEY_VERIFICATION_KEY,
+ KEY_VERIFICATION_MAC,
+ KEY_VERIFICATION_CANCEL,
+ KEY_VERIFICATION_DONE,
+ KEY_VERIFICATION_READY -> true
+ else -> false
+ }
+ }
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 901700cac6..9c3e0ba1c5 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -40,6 +40,7 @@ import org.matrix.android.sdk.api.failure.Failure
import org.matrix.android.sdk.api.listeners.ProgressListener
import org.matrix.android.sdk.api.logger.LoggerTag
import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
import org.matrix.android.sdk.api.session.crypto.MXCryptoError
import org.matrix.android.sdk.api.session.crypto.NewSessionListener
import org.matrix.android.sdk.api.session.crypto.OutgoingKeyRequest
@@ -1163,6 +1164,10 @@ internal class DefaultCryptoService @Inject constructor(
return cryptoStore.getGlobalBlacklistUnverifiedDevices()
}
+ override fun getLiveGlobalCryptoConfig(): LiveData<GlobalCryptoConfig> {
+ return cryptoStore.getLiveGlobalCryptoConfig()
+ }
+
/**
* Tells whether the client should encrypt messages only for the verified devices
* in this room.
@@ -1171,39 +1176,28 @@ internal class DefaultCryptoService @Inject constructor(
* @param roomId the room id
* @return true if the client should encrypt messages only for the verified devices.
*/
-// TODO add this info in CryptoRoomEntity?
override fun isRoomBlacklistUnverifiedDevices(roomId: String?): Boolean {
- return roomId?.let { cryptoStore.getRoomsListBlacklistUnverifiedDevices().contains(it) }
+ return roomId?.let { cryptoStore.getBlockUnverifiedDevices(roomId) }
?: false
}
/**
- * Manages the room black-listing for unverified devices.
+ * A live status regarding sharing keys for unverified devices in this room.
*
- * @param roomId the room id
- * @param add true to add the room id to the list, false to remove it.
+ * @return Live status
*/
- private fun setRoomBlacklistUnverifiedDevices(roomId: String, add: Boolean) {
- val roomIds = cryptoStore.getRoomsListBlacklistUnverifiedDevices().toMutableList()
-
- if (add) {
- if (roomId !in roomIds) {
- roomIds.add(roomId)
- }
- } else {
- roomIds.remove(roomId)
- }
-
- cryptoStore.setRoomsListBlacklistUnverifiedDevices(roomIds)
+ override fun getLiveBlockUnverifiedDevices(roomId: String): LiveData<Boolean> {
+ return cryptoStore.getLiveBlockUnverifiedDevices(roomId)
}
/**
* Add this room to the ones which don't encrypt messages to unverified devices.
*
* @param roomId the room id
+ * @param block if true will block sending keys to unverified devices
*/
- override fun setRoomBlacklistUnverifiedDevices(roomId: String) {
- setRoomBlacklistUnverifiedDevices(roomId, true)
+ override fun setRoomBlockUnverifiedDevices(roomId: String, block: Boolean) {
+ cryptoStore.blockUnverifiedDevicesInRoom(roomId, block)
}
/**
@@ -1211,8 +1205,8 @@ internal class DefaultCryptoService @Inject constructor(
*
* @param roomId the room id
*/
- override fun setRoomUnBlacklistUnverifiedDevices(roomId: String) {
- setRoomBlacklistUnverifiedDevices(roomId, false)
+ override fun setRoomUnBlockUnverifiedDevices(roomId: String) {
+ setRoomBlockUnverifiedDevices(roomId, false)
}
/**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index fca6fab66c..0b7af9f4d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -31,6 +31,8 @@ import org.matrix.android.sdk.api.session.events.model.Content
import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.events.model.content.RoomKeyWithHeldContent
import org.matrix.android.sdk.api.session.events.model.content.WithHeldCode
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
import org.matrix.android.sdk.internal.crypto.DeviceListManager
import org.matrix.android.sdk.internal.crypto.InboundGroupSessionHolder
import org.matrix.android.sdk.internal.crypto.MXOlmDevice
@@ -92,7 +94,18 @@ internal class MXMegolmEncryption(
): Content {
val ts = clock.epochMillis()
Timber.tag(loggerTag.value).v("encryptEventContent : getDevicesInRoom")
- val devices = getDevicesInRoom(userIds)
+
+ /**
+ * When using in-room messages and the room has encryption enabled,
+ * clients should ensure that encryption does not hinder the verification.
+ * For example, if the verification messages are encrypted, clients must ensure that all the recipient’s
+ * unverified devices receive the keys necessary to decrypt the messages,
+ * even if they would normally not be given the keys to decrypt messages in the room.
+ */
+ val shouldSendToUnverified = isVerificationEvent(eventType, eventContent)
+
+ val devices = getDevicesInRoom(userIds, forceDistributeToUnverified = shouldSendToUnverified)
+
Timber.tag(loggerTag.value).d("encrypt event in room=$roomId - devices count in room ${devices.allowedDevices.toDebugCount()}")
Timber.tag(loggerTag.value).v("encryptEventContent ${clock.epochMillis() - ts}: getDevicesInRoom ${devices.allowedDevices.toDebugString()}")
val outboundSession = ensureOutboundSession(devices.allowedDevices)
@@ -107,6 +120,11 @@ internal class MXMegolmEncryption(
}
}
+ private fun isVerificationEvent(eventType: String, eventContent: Content) =
+ EventType.isVerificationEvent(eventType) ||
+ (eventType == EventType.MESSAGE &&
+ eventContent.get(MessageContent.MSG_TYPE_JSON_KEY) == MessageType.MSGTYPE_VERIFICATION_REQUEST)
+
private fun notifyWithheldForSession(devices: MXUsersDevicesMap<WithHeldCode>, outboundSession: MXOutboundSessionInfo) {
// offload to computation thread
cryptoCoroutineScope.launch(coroutineDispatchers.computation) {
@@ -416,15 +434,17 @@ internal class MXMegolmEncryption(
* This method must be called in getDecryptingThreadHandler() thread.
*
* @param userIds the user ids whose devices must be checked.
+ * @param forceDistributeToUnverified If true the unverified devices will be included in valid recipients even if
+ * such devices are blocked in crypto settings
*/
- private suspend fun getDevicesInRoom(userIds: List<String>): DeviceInRoomInfo {
+ private suspend fun getDevicesInRoom(userIds: List<String>, forceDistributeToUnverified: Boolean = false): DeviceInRoomInfo {
// We are happy to use a cached version here: we assume that if we already
// have a list of the user's devices, then we already share an e2e room
// with them, which means that they will have announced any new devices via
// an m.new_device.
val keys = deviceListManager.downloadKeys(userIds, false)
val encryptToVerifiedDevicesOnly = cryptoStore.getGlobalBlacklistUnverifiedDevices() ||
- cryptoStore.getRoomsListBlacklistUnverifiedDevices().contains(roomId)
+ cryptoStore.getBlockUnverifiedDevices(roomId)
val devicesInRoom = DeviceInRoomInfo()
val unknownDevices = MXUsersDevicesMap<CryptoDeviceInfo>()
@@ -444,7 +464,7 @@ internal class MXMegolmEncryption(
continue
}
- if (!deviceInfo.isVerified && encryptToVerifiedDevicesOnly) {
+ if (!deviceInfo.isVerified && encryptToVerifiedDevicesOnly && !forceDistributeToUnverified) {
devicesInRoom.withHeldDevices.setObject(userId, deviceId, WithHeldCode.UNVERIFIED)
continue
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index d405bdce27..f4796155c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -60,7 +60,7 @@ import javax.inject.Inject
@SessionScope
internal class DefaultCrossSigningService @Inject constructor(
- @UserId private val userId: String,
+ @UserId private val myUserId: String,
@SessionId private val sessionId: String,
private val cryptoStore: IMXCryptoStore,
private val deviceListManager: DeviceListManager,
@@ -127,7 +127,7 @@ internal class DefaultCrossSigningService @Inject constructor(
}
// Recover local trust in case private key are there?
- setUserKeysAsTrusted(userId, checkUserTrust(userId).isVerified())
+ setUserKeysAsTrusted(myUserId, checkUserTrust(myUserId).isVerified())
}
} catch (e: Throwable) {
// Mmm this kind of a big issue
@@ -167,9 +167,13 @@ internal class DefaultCrossSigningService @Inject constructor(
}
override fun onSuccess(data: InitializeCrossSigningTask.Result) {
- val crossSigningInfo = MXCrossSigningInfo(userId, listOf(data.masterKeyInfo, data.userKeyInfo, data.selfSignedKeyInfo))
+ val crossSigningInfo = MXCrossSigningInfo(
+ myUserId,
+ listOf(data.masterKeyInfo, data.userKeyInfo, data.selfSignedKeyInfo),
+ true
+ )
cryptoStore.setMyCrossSigningInfo(crossSigningInfo)
- setUserKeysAsTrusted(userId, true)
+ setUserKeysAsTrusted(myUserId, true)
cryptoStore.storePrivateKeysInfo(data.masterKeyPK, data.userKeyPK, data.selfSigningKeyPK)
crossSigningOlm.masterPkSigning = OlmPkSigning().apply { initWithSeed(data.masterKeyPK.fromBase64()) }
crossSigningOlm.userPkSigning = OlmPkSigning().apply { initWithSeed(data.userKeyPK.fromBase64()) }
@@ -266,7 +270,7 @@ internal class DefaultCrossSigningService @Inject constructor(
uskKeyPrivateKey: String?,
sskPrivateKey: String?
): UserTrustResult {
- val mxCrossSigningInfo = getMyCrossSigningKeys() ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+ val mxCrossSigningInfo = getMyCrossSigningKeys() ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
var masterKeyIsTrusted = false
var userKeyIsTrusted = false
@@ -330,7 +334,7 @@ internal class DefaultCrossSigningService @Inject constructor(
val checkSelfTrust = checkSelfTrust()
if (checkSelfTrust.isVerified()) {
cryptoStore.storePrivateKeysInfo(masterKeyPrivateKey, uskKeyPrivateKey, sskPrivateKey)
- setUserKeysAsTrusted(userId, true)
+ setUserKeysAsTrusted(myUserId, true)
}
return checkSelfTrust
}
@@ -351,7 +355,7 @@ internal class DefaultCrossSigningService @Inject constructor(
* .
*/
override fun isUserTrusted(otherUserId: String): Boolean {
- return cryptoStore.getCrossSigningInfo(userId)?.isTrusted() == true
+ return cryptoStore.getCrossSigningInfo(otherUserId)?.isTrusted() == true
}
override fun isCrossSigningVerified(): Boolean {
@@ -363,7 +367,7 @@ internal class DefaultCrossSigningService @Inject constructor(
*/
override fun checkUserTrust(otherUserId: String): UserTrustResult {
Timber.v("## CrossSigning checkUserTrust for $otherUserId")
- if (otherUserId == userId) {
+ if (otherUserId == myUserId) {
return checkSelfTrust()
}
// I trust a user if I trust his master key
@@ -371,16 +375,14 @@ internal class DefaultCrossSigningService @Inject constructor(
// TODO what if the master key is signed by a device key that i have verified
// First let's get my user key
- val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(userId)
+ val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(myUserId)
- checkOtherMSKTrusted(myCrossSigningInfo, cryptoStore.getCrossSigningInfo(otherUserId))
-
- return UserTrustResult.Success
+ return checkOtherMSKTrusted(myCrossSigningInfo, cryptoStore.getCrossSigningInfo(otherUserId))
}
fun checkOtherMSKTrusted(myCrossSigningInfo: MXCrossSigningInfo?, otherInfo: MXCrossSigningInfo?): UserTrustResult {
val myUserKey = myCrossSigningInfo?.userKey()
- ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+ ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
if (!myCrossSigningInfo.isTrusted()) {
return UserTrustResult.KeysNotTrusted(myCrossSigningInfo)
@@ -391,7 +393,7 @@ internal class DefaultCrossSigningService @Inject constructor(
?: return UserTrustResult.UnknownCrossSignatureInfo(otherInfo?.userId ?: "")
val masterKeySignaturesMadeByMyUserKey = otherMasterKey.signatures
- ?.get(userId) // Signatures made by me
+ ?.get(myUserId) // Signatures made by me
?.get("ed25519:${myUserKey.unpaddedBase64PublicKey}")
if (masterKeySignaturesMadeByMyUserKey.isNullOrBlank()) {
@@ -417,9 +419,9 @@ internal class DefaultCrossSigningService @Inject constructor(
// Special case when it's me,
// I have to check that MSK -> USK -> SSK
// and that MSK is trusted (i know the private key, or is signed by a trusted device)
- val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(userId)
+ val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(myUserId)
- return checkSelfTrust(myCrossSigningInfo, cryptoStore.getUserDeviceList(userId))
+ return checkSelfTrust(myCrossSigningInfo, cryptoStore.getUserDeviceList(myUserId))
}
fun checkSelfTrust(myCrossSigningInfo: MXCrossSigningInfo?, myDevices: List<CryptoDeviceInfo>?): UserTrustResult {
@@ -429,7 +431,7 @@ internal class DefaultCrossSigningService @Inject constructor(
// val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(userId)
val myMasterKey = myCrossSigningInfo?.masterKey()
- ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+ ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
// Is the master key trusted
// 1) check if I know the private key
@@ -453,7 +455,7 @@ internal class DefaultCrossSigningService @Inject constructor(
olmPkSigning?.releaseSigning()
} else {
// Maybe it's signed by a locally trusted device?
- myMasterKey.signatures?.get(userId)?.forEach { (key, value) ->
+ myMasterKey.signatures?.get(myUserId)?.forEach { (key, value) ->
val potentialDeviceId = key.removePrefix("ed25519:")
val potentialDevice = myDevices?.firstOrNull { it.deviceId == potentialDeviceId } // cryptoStore.getUserDevice(userId, potentialDeviceId)
if (potentialDevice != null && potentialDevice.isVerified) {
@@ -475,14 +477,14 @@ internal class DefaultCrossSigningService @Inject constructor(
}
val myUserKey = myCrossSigningInfo.userKey()
- ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+ ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
val userKeySignaturesMadeByMyMasterKey = myUserKey.signatures
- ?.get(userId) // Signatures made by me
+ ?.get(myUserId) // Signatures made by me
?.get("ed25519:${myMasterKey.unpaddedBase64PublicKey}")
if (userKeySignaturesMadeByMyMasterKey.isNullOrBlank()) {
- Timber.d("## CrossSigning checkUserTrust false for $userId, USK not signed by MSK")
+ Timber.d("## CrossSigning checkUserTrust false for $myUserId, USK not signed by MSK")
return UserTrustResult.KeyNotSigned(myUserKey)
}
@@ -498,14 +500,14 @@ internal class DefaultCrossSigningService @Inject constructor(
}
val mySSKey = myCrossSigningInfo.selfSigningKey()
- ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+ ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
val ssKeySignaturesMadeByMyMasterKey = mySSKey.signatures
- ?.get(userId) // Signatures made by me
+ ?.get(myUserId) // Signatures made by me
?.get("ed25519:${myMasterKey.unpaddedBase64PublicKey}")
if (ssKeySignaturesMadeByMyMasterKey.isNullOrBlank()) {
- Timber.d("## CrossSigning checkUserTrust false for $userId, SSK not signed by MSK")
+ Timber.d("## CrossSigning checkUserTrust false for $myUserId, SSK not signed by MSK")
return UserTrustResult.KeyNotSigned(mySSKey)
}
@@ -555,14 +557,14 @@ internal class DefaultCrossSigningService @Inject constructor(
override fun trustUser(otherUserId: String, callback: MatrixCallback<Unit>) {
cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
- Timber.d("## CrossSigning - Mark user $userId as trusted ")
+ Timber.d("## CrossSigning - Mark user $otherUserId as trusted ")
// We should have this user keys
val otherMasterKeys = getUserCrossSigningKeys(otherUserId)?.masterKey()
if (otherMasterKeys == null) {
callback.onFailure(Throwable("## CrossSigning - Other master signing key is not known"))
return@launch
}
- val myKeys = getUserCrossSigningKeys(userId)
+ val myKeys = getUserCrossSigningKeys(myUserId)
if (myKeys == null) {
callback.onFailure(Throwable("## CrossSigning - CrossSigning is not setup for this account"))
return@launch
@@ -586,16 +588,22 @@ internal class DefaultCrossSigningService @Inject constructor(
}
cryptoStore.setUserKeysAsTrusted(otherUserId, true)
- // TODO update local copy with new signature directly here? kind of local echo of trust?
- Timber.d("## CrossSigning - Upload signature of $userId MSK signed by USK")
+ Timber.d("## CrossSigning - Upload signature of $otherUserId MSK signed by USK")
val uploadQuery = UploadSignatureQueryBuilder()
- .withSigningKeyInfo(otherMasterKeys.copyForSignature(userId, userPubKey, newSignature))
+ .withSigningKeyInfo(otherMasterKeys.copyForSignature(myUserId, userPubKey, newSignature))
.build()
uploadSignaturesTask.configureWith(UploadSignaturesTask.Params(uploadQuery)) {
this.executionThread = TaskThread.CRYPTO
this.callback = callback
}.executeBy(taskExecutor)
+
+ // Local echo for device cross trust, to avoid having to wait for a notification of key change
+ cryptoStore.getUserDeviceList(otherUserId)?.forEach { device ->
+ val updatedTrust = checkDeviceTrust(device.userId, device.deviceId, device.trustLevel?.isLocallyVerified() ?: false)
+ Timber.v("## CrossSigning - update trust for device ${device.deviceId} of user $otherUserId , verified=$updatedTrust")
+ cryptoStore.setDeviceTrust(device.userId, device.deviceId, updatedTrust.isCrossSignedVerified(), updatedTrust.isLocallyVerified())
+ }
}
}
@@ -604,20 +612,20 @@ internal class DefaultCrossSigningService @Inject constructor(
cryptoStore.markMyMasterKeyAsLocallyTrusted(true)
checkSelfTrust()
// re-verify all trusts
- onUsersDeviceUpdate(listOf(userId))
+ onUsersDeviceUpdate(listOf(myUserId))
}
}
override fun trustDevice(deviceId: String, callback: MatrixCallback<Unit>) {
cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
// This device should be yours
- val device = cryptoStore.getUserDevice(userId, deviceId)
+ val device = cryptoStore.getUserDevice(myUserId, deviceId)
if (device == null) {
callback.onFailure(IllegalArgumentException("This device [$deviceId] is not known, or not yours"))
return@launch
}
- val myKeys = getUserCrossSigningKeys(userId)
+ val myKeys = getUserCrossSigningKeys(myUserId)
if (myKeys == null) {
callback.onFailure(Throwable("CrossSigning is not setup for this account"))
return@launch
@@ -639,7 +647,7 @@ internal class DefaultCrossSigningService @Inject constructor(
}
val toUpload = device.copy(
signatures = mapOf(
- userId
+ myUserId
to
mapOf(
"ed25519:$ssPubKey" to newSignature
@@ -661,8 +669,8 @@ internal class DefaultCrossSigningService @Inject constructor(
val otherDevice = cryptoStore.getUserDevice(otherUserId, otherDeviceId)
?: return DeviceTrustResult.UnknownDevice(otherDeviceId)
- val myKeys = getUserCrossSigningKeys(userId)
- ?: return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.CrossSigningNotConfigured(userId))
+ val myKeys = getUserCrossSigningKeys(myUserId)
+ ?: return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.CrossSigningNotConfigured(myUserId))
if (!myKeys.isTrusted()) return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.KeysNotTrusted(myKeys))
@@ -717,7 +725,7 @@ internal class DefaultCrossSigningService @Inject constructor(
fun checkDeviceTrust(myKeys: MXCrossSigningInfo?, otherKeys: MXCrossSigningInfo?, otherDevice: CryptoDeviceInfo): DeviceTrustResult {
val locallyTrusted = otherDevice.trustLevel?.isLocallyVerified()
- myKeys ?: return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.CrossSigningNotConfigured(userId))
+ myKeys ?: return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.CrossSigningNotConfigured(myUserId))
if (!myKeys.isTrusted()) return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.KeysNotTrusted(myKeys))
@@ -805,7 +813,7 @@ internal class DefaultCrossSigningService @Inject constructor(
cryptoStore.setUserKeysAsTrusted(otherUserId, trusted)
// If it's me, recheck trust of all users and devices?
val users = ArrayList<String>()
- if (otherUserId == userId && currentTrust != trusted) {
+ if (otherUserId == myUserId && currentTrust != trusted) {
// notify key requester
outgoingKeyRequestManager.onSelfCrossSigningTrustChanged(trusted)
cryptoStore.updateUsersTrust {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
index 6d845ec59e..fffc6707d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
@@ -161,6 +161,7 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
// i have all the new trusts, update DB
trusts.forEach {
val verified = it.value?.isVerified() == true
+ Timber.v("[$myUserId] ## CrossSigning - Updating user trust: ${it.key} to $verified")
updateCrossSigningKeysTrust(cryptoRealm, it.key, verified)
}
@@ -259,21 +260,27 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
cryptoRealm.where(CrossSigningInfoEntity::class.java)
.equalTo(CrossSigningInfoEntityFields.USER_ID, userId)
.findFirst()
- ?.crossSigningKeys
- ?.forEach { info ->
- // optimization to avoid trigger updates when there is no change..
- if (info.trustLevelEntity?.isVerified() != verified) {
- Timber.d("## CrossSigning - Trust change for $userId : $verified")
- val level = info.trustLevelEntity
- if (level == null) {
- info.trustLevelEntity = cryptoRealm.createObject(TrustLevelEntity::class.java).also {
- it.locallyVerified = verified
- it.crossSignedVerified = verified
+ ?.let { userKeyInfo ->
+ userKeyInfo
+ .crossSigningKeys
+ .forEach { key ->
+ // optimization to avoid trigger updates when there is no change..
+ if (key.trustLevelEntity?.isVerified() != verified) {
+ Timber.d("## CrossSigning - Trust change for $userId : $verified")
+ val level = key.trustLevelEntity
+ if (level == null) {
+ key.trustLevelEntity = cryptoRealm.createObject(TrustLevelEntity::class.java).also {
+ it.locallyVerified = verified
+ it.crossSignedVerified = verified
+ }
+ } else {
+ level.locallyVerified = verified
+ level.crossSignedVerified = verified
+ }
+ }
}
- } else {
- level.locallyVerified = verified
- level.crossSignedVerified = verified
- }
+ if (verified) {
+ userKeyInfo.wasUserVerifiedOnce = true
}
}
}
@@ -299,8 +306,18 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
getCrossSigningInfo(cryptoRealm, userId)?.isTrusted() == true
}
+ val resetTrust = listToCheck
+ .filter { userId ->
+ val crossSigningInfo = getCrossSigningInfo(cryptoRealm, userId)
+ crossSigningInfo?.isTrusted() != true && crossSigningInfo?.wasTrustedOnce == true
+ }
+
return if (allTrustedUserIds.isEmpty()) {
- RoomEncryptionTrustLevel.Default
+ if (resetTrust.isEmpty()) {
+ RoomEncryptionTrustLevel.Default
+ } else {
+ RoomEncryptionTrustLevel.Warning
+ }
} else {
// If one of the verified user as an untrusted device -> warning
// If all devices of all verified users are trusted -> green
@@ -327,11 +344,15 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
if (hasWarning) {
RoomEncryptionTrustLevel.Warning
} else {
- if (listToCheck.size == allTrustedUserIds.size) {
- // all users are trusted and all devices are verified
- RoomEncryptionTrustLevel.Trusted
+ if (resetTrust.isEmpty()) {
+ if (listToCheck.size == allTrustedUserIds.size) {
+ // all users are trusted and all devices are verified
+ RoomEncryptionTrustLevel.Trusted
+ } else {
+ RoomEncryptionTrustLevel.Default
+ }
} else {
- RoomEncryptionTrustLevel.Default
+ RoomEncryptionTrustLevel.Warning
}
}
}
@@ -344,7 +365,8 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
userId = userId,
crossSigningKeys = xsignInfo.crossSigningKeys.mapNotNull {
crossSigningKeysMapper.map(userId, it)
- }
+ },
+ wasTrustedOnce = xsignInfo.wasUserVerifiedOnce
)
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
index 56eba25249..21e3342365 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.crypto.store
import androidx.lifecycle.LiveData
import androidx.paging.PagedList
+import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
import org.matrix.android.sdk.api.session.crypto.NewSessionListener
import org.matrix.android.sdk.api.session.crypto.OutgoingKeyRequest
import org.matrix.android.sdk.api.session.crypto.OutgoingRoomKeyRequestState
@@ -120,11 +121,26 @@ internal interface IMXCryptoStore {
fun getRoomsListBlacklistUnverifiedDevices(): List<String>
/**
- * Updates the rooms ids list in which the messages are not encrypted for the unverified devices.
+ * A live status regarding sharing keys for unverified devices in this room.
*
- * @param roomIds the room ids list
+ * @return Live status
*/
- fun setRoomsListBlacklistUnverifiedDevices(roomIds: List<String>)
+ fun getLiveBlockUnverifiedDevices(roomId: String): LiveData<Boolean>
+
+ /**
+ * Tell if unverified devices should be blacklisted when sending keys.
+ *
+ * @return true if should not send keys to unverified devices
+ */
+ fun getBlockUnverifiedDevices(roomId: String): Boolean
+
+ /**
+ * Define if encryption keys should be sent to unverified devices in this room.
+ *
+ * @param roomId the roomId
+ * @param block if true will not send keys to unverified devices
+ */
+ fun blockUnverifiedDevicesInRoom(roomId: String, block: Boolean)
/**
* Get the current keys backup version.
@@ -516,6 +532,9 @@ internal interface IMXCryptoStore {
fun getCrossSigningPrivateKeys(): PrivateKeysInfo?
fun getLiveCrossSigningPrivateKeys(): LiveData<Optional<PrivateKeysInfo>>
+ fun getGlobalCryptoConfig(): GlobalCryptoConfig
+ fun getLiveGlobalCryptoConfig(): LiveData<GlobalCryptoConfig>
+
fun saveBackupRecoveryKey(recoveryKey: String?, version: String?)
fun getKeyBackupRecoveryKeyInfo(): SavedKeyBackupKeyInfo?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 3b8fa4cacd..e97cf437c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -29,6 +29,7 @@ import io.realm.kotlin.where
import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
import org.matrix.android.sdk.api.session.crypto.NewSessionListener
import org.matrix.android.sdk.api.session.crypto.OutgoingKeyRequest
import org.matrix.android.sdk.api.session.crypto.OutgoingRoomKeyRequestState
@@ -445,6 +446,38 @@ internal class RealmCryptoStore @Inject constructor(
}
}
+ override fun getGlobalCryptoConfig(): GlobalCryptoConfig {
+ return doWithRealm(realmConfiguration) { realm ->
+ realm.where<CryptoMetadataEntity>().findFirst()
+ ?.let {
+ GlobalCryptoConfig(
+ globalBlockUnverifiedDevices = it.globalBlacklistUnverifiedDevices,
+ globalEnableKeyGossiping = it.globalEnableKeyGossiping,
+ enableKeyForwardingOnInvite = it.enableKeyForwardingOnInvite
+ )
+ } ?: GlobalCryptoConfig(false, false, false)
+ }
+ }
+
+ override fun getLiveGlobalCryptoConfig(): LiveData<GlobalCryptoConfig> {
+ val liveData = monarchy.findAllMappedWithChanges(
+ { realm: Realm ->
+ realm
+ .where<CryptoMetadataEntity>()
+ },
+ {
+ GlobalCryptoConfig(
+ globalBlockUnverifiedDevices = it.globalBlacklistUnverifiedDevices,
+ globalEnableKeyGossiping = it.globalEnableKeyGossiping,
+ enableKeyForwardingOnInvite = it.enableKeyForwardingOnInvite
+ )
+ }
+ )
+ return Transformations.map(liveData) {
+ it.firstOrNull() ?: GlobalCryptoConfig(false, false, false)
+ }
+ }
+
override fun storePrivateKeysInfo(msk: String?, usk: String?, ssk: String?) {
Timber.v("## CRYPTO | *** storePrivateKeysInfo ${msk != null}, ${usk != null}, ${ssk != null}")
doRealmTransaction(realmConfiguration) { realm ->
@@ -1053,25 +1086,6 @@ internal class RealmCryptoStore @Inject constructor(
} ?: false
}
- override fun setRoomsListBlacklistUnverifiedDevices(roomIds: List<String>) {
- doRealmTransaction(realmConfiguration) {
- // Reset all
- it.where<CryptoRoomEntity>()
- .findAll()
- .forEach { room ->
- room.blacklistUnverifiedDevices = false
- }
-
- // Enable those in the list
- it.where<CryptoRoomEntity>()
- .`in`(CryptoRoomEntityFields.ROOM_ID, roomIds.toTypedArray())
- .findAll()
- .forEach { room ->
- room.blacklistUnverifiedDevices = true
- }
- }
- }
-
override fun getRoomsListBlacklistUnverifiedDevices(): List<String> {
return doWithRealm(realmConfiguration) {
it.where<CryptoRoomEntity>()
@@ -1083,6 +1097,37 @@ internal class RealmCryptoStore @Inject constructor(
}
}
+ override fun getLiveBlockUnverifiedDevices(roomId: String): LiveData<Boolean> {
+ val liveData = monarchy.findAllMappedWithChanges(
+ { realm: Realm ->
+ realm.where<CryptoRoomEntity>()
+ .equalTo(CryptoRoomEntityFields.ROOM_ID, roomId)
+ },
+ {
+ it.blacklistUnverifiedDevices
+ }
+ )
+ return Transformations.map(liveData) {
+ it.firstOrNull() ?: false
+ }
+ }
+
+ override fun getBlockUnverifiedDevices(roomId: String): Boolean {
+ return doWithRealm(realmConfiguration) { realm ->
+ realm.where<CryptoRoomEntity>()
+ .equalTo(CryptoRoomEntityFields.ROOM_ID, roomId)
+ .findFirst()
+ ?.blacklistUnverifiedDevices ?: false
+ }
+ }
+
+ override fun blockUnverifiedDevicesInRoom(roomId: String, block: Boolean) {
+ doRealmTransaction(realmConfiguration) { realm ->
+ CryptoRoomEntity.getById(realm, roomId)
+ ?.blacklistUnverifiedDevices = block
+ }
+ }
+
override fun getDeviceTrackingStatuses(): Map<String, Int> {
return doWithRealm(realmConfiguration) {
it.where<UserEntity>()
@@ -1611,7 +1656,8 @@ internal class RealmCryptoStore @Inject constructor(
userId = userId,
crossSigningKeys = xsignInfo.crossSigningKeys.mapNotNull {
crossSigningKeysMapper.map(userId, it)
- }
+ },
+ wasTrustedOnce = xsignInfo.wasUserVerifiedOnce
)
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
index 426d50a54f..de2b74308d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo
import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo016
import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo017
import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo018
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo019
import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
import org.matrix.android.sdk.internal.util.time.Clock
import javax.inject.Inject
@@ -49,7 +50,7 @@ internal class RealmCryptoStoreMigration @Inject constructor(
private val clock: Clock,
) : MatrixRealmMigration(
dbName = "Crypto",
- schemaVersion = 18L,
+ schemaVersion = 19L,
) {
/**
* Forces all RealmCryptoStoreMigration instances to be equal.
@@ -77,5 +78,6 @@ internal class RealmCryptoStoreMigration @Inject constructor(
if (oldVersion < 16) MigrateCryptoTo016(realm).perform()
if (oldVersion < 17) MigrateCryptoTo017(realm).perform()
if (oldVersion < 18) MigrateCryptoTo018(realm).perform()
+ if (oldVersion < 19) MigrateCryptoTo019(realm).perform()
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo019.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo019.kt
new file mode 100644
index 0000000000..9d2eb60a60
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo019.kt
@@ -0,0 +1,59 @@
+/*
+ * 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.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import io.realm.DynamicRealmObject
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KeyUsage
+import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeyInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+/**
+ * This migration is adding support for trusted flags on megolm sessions.
+ * We can't really assert the trust of existing keys, so for the sake of simplicity we are going to
+ * mark existing keys as safe.
+ * This migration can take long depending on the account
+ */
+internal class MigrateCryptoTo019(realm: DynamicRealm) : RealmMigrator(realm, 18) {
+
+ override fun doMigrate(realm: DynamicRealm) {
+ realm.schema.get("CrossSigningInfoEntity")
+ ?.addField(CrossSigningInfoEntityFields.WAS_USER_VERIFIED_ONCE, Boolean::class.java)
+ ?.transform { dynamicObject ->
+
+ val knowKeys = dynamicObject.getList(CrossSigningInfoEntityFields.CROSS_SIGNING_KEYS.`$`)
+ val msk = knowKeys.firstOrNull {
+ it.getList(KeyInfoEntityFields.USAGES.`$`, String::class.java).orEmpty().contains(KeyUsage.MASTER.value)
+ }
+ val ssk = knowKeys.firstOrNull {
+ it.getList(KeyInfoEntityFields.USAGES.`$`, String::class.java).orEmpty().contains(KeyUsage.SELF_SIGNING.value)
+ }
+ val isTrusted = isDynamicKeyInfoTrusted(msk?.get<DynamicRealmObject>(KeyInfoEntityFields.TRUST_LEVEL_ENTITY.`$`)) &&
+ isDynamicKeyInfoTrusted(ssk?.get<DynamicRealmObject>(KeyInfoEntityFields.TRUST_LEVEL_ENTITY.`$`))
+
+ dynamicObject.setBoolean(CrossSigningInfoEntityFields.WAS_USER_VERIFIED_ONCE, isTrusted)
+ }
+ }
+
+ private fun isDynamicKeyInfoTrusted(keyInfo: DynamicRealmObject?): Boolean {
+ if (keyInfo == null) return false
+ return !keyInfo.isNull(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED) && keyInfo.getBoolean(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED) &&
+ !keyInfo.isNull(TrustLevelEntityFields.LOCALLY_VERIFIED) && keyInfo.getBoolean(TrustLevelEntityFields.LOCALLY_VERIFIED)
+ }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
index 5aba9bb9ba..033b7662c5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.internal.extensions.clearWith
internal open class CrossSigningInfoEntity(
@PrimaryKey
var userId: String? = null,
+ var wasUserVerifiedOnce: Boolean = false,
var crossSigningKeys: RealmList<KeyInfoEntity> = RealmList()
) : RealmObject() {
diff --git a/tools/danger/dangerfile.js b/tools/danger/dangerfile.js
index 6314ec8f68..1a36474470 100644
--- a/tools/danger/dangerfile.js
+++ b/tools/danger/dangerfile.js
@@ -70,6 +70,7 @@ const signOff = "Signed-off-by:"
// Please add new names following the alphabetical order.
const allowList = [
+ "amitkma",
"aringenbach",
"BillCarsonFr",
"bmarty",
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index a4bc105a1d..7dcd6a648e 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -410,7 +410,7 @@ dependencies {
androidTestImplementation libs.mockk.mockkAndroid
androidTestUtil libs.androidx.orchestrator
androidTestImplementation libs.androidx.fragmentTesting
- androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
+ androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.20"
debugImplementation libs.androidx.fragmentTesting
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
}
diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
index 2c57dd058d..62c34e1b66 100644
--- a/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
@@ -34,18 +34,18 @@ class RoomSettingsRobot {
fun crawl() {
// Room settings
- clickListItem(R.id.matrixProfileRecyclerView, 3)
+ clickListItem(R.id.matrixProfileRecyclerView, 4)
navigateToRoomParameters()
pressBack()
// Notifications
- clickListItem(R.id.matrixProfileRecyclerView, 5)
+ clickListItem(R.id.matrixProfileRecyclerView, 6)
pressBack()
assertDisplayed(R.id.roomProfileAvatarView)
// People
- clickListItem(R.id.matrixProfileRecyclerView, 7)
+ clickListItem(R.id.matrixProfileRecyclerView, 8)
assertDisplayed(R.id.inviteUsersButton)
navigateToRoomPeople()
// Fab
@@ -56,7 +56,7 @@ class RoomSettingsRobot {
assertDisplayed(R.id.roomProfileAvatarView)
// Uploads
- clickListItem(R.id.matrixProfileRecyclerView, 9)
+ clickListItem(R.id.matrixProfileRecyclerView, 10)
// File tab
clickOn(R.string.uploads_files_title)
waitUntilViewVisible(withText(R.string.uploads_media_title))
@@ -73,12 +73,12 @@ class RoomSettingsRobot {
// Advanced
// Room addresses
- clickListItem(R.id.matrixProfileRecyclerView, 15)
+ clickListItem(R.id.matrixProfileRecyclerView, 16)
waitUntilViewVisible(withText(R.string.room_alias_published_alias_title))
pressBack()
// Room permissions
- clickListItem(R.id.matrixProfileRecyclerView, 17)
+ clickListItem(R.id.matrixProfileRecyclerView, 18)
waitUntilViewVisible(withText(R.string.room_permissions_change_room_avatar))
clickOn(R.string.room_permissions_change_room_avatar)
waitUntilDialogVisible(withId(android.R.id.button2))
@@ -95,7 +95,7 @@ class RoomSettingsRobot {
}
private fun leaveRoom(block: DialogRobot.() -> Unit) {
- clickListItem(R.id.matrixProfileRecyclerView, 13)
+ clickListItem(R.id.matrixProfileRecyclerView, 14)
waitUntilDialogVisible(withId(android.R.id.button2))
val dialogRobot = DialogRobot()
block(dialogRobot)
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 9118dea1e3..b927d66b69 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
@@ -90,6 +90,11 @@ class DebugFeaturesStateFactory @Inject constructor(
key = DebugFeatureKeys.newDeviceManagementEnabled,
factory = VectorFeatures::isNewDeviceManagementEnabled
),
+ createBooleanFeature(
+ label = "Enable Voice Broadcast",
+ key = DebugFeatureKeys.voiceBroadcastEnabled,
+ factory = VectorFeatures::isVoiceBroadcastEnabled
+ ),
)
)
}
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 c01c058fc6..c347accfc3 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
@@ -79,6 +79,9 @@ class DebugVectorFeatures(
override fun isNewDeviceManagementEnabled(): Boolean = read(DebugFeatureKeys.newDeviceManagementEnabled)
?: vectorFeatures.isNewDeviceManagementEnabled()
+ override fun isVoiceBroadcastEnabled(): Boolean = read(DebugFeatureKeys.voiceBroadcastEnabled)
+ ?: vectorFeatures.isVoiceBroadcastEnabled()
+
fun <T> override(value: T?, key: Preferences.Key<T>) = updatePreferences {
if (value == null) {
it.remove(key)
@@ -140,4 +143,5 @@ object DebugFeatureKeys {
val startDmOnFirstMsg = booleanPreferencesKey("start-dm-on-first-msg")
val newAppLayoutEnabled = booleanPreferencesKey("new-app-layout-enabled")
val newDeviceManagementEnabled = booleanPreferencesKey("new-device-management-enabled")
+ val voiceBroadcastEnabled = booleanPreferencesKey("voice-broadcast-enabled")
}
diff --git a/vector-config/src/main/java/im/vector/app/config/Analytics.kt b/vector-config/src/main/java/im/vector/app/config/Analytics.kt
index 7fdc78dc8a..d944a84f94 100644
--- a/vector-config/src/main/java/im/vector/app/config/Analytics.kt
+++ b/vector-config/src/main/java/im/vector/app/config/Analytics.kt
@@ -27,9 +27,9 @@ sealed interface Analytics {
object Disabled : Analytics
/**
- * Analytics integration via PostHog.
+ * Analytics integration via PostHog and Sentry.
*/
- data class PostHog(
+ data class Enabled(
/**
* The PostHog instance url.
*/
@@ -44,5 +44,15 @@ sealed interface Analytics {
* A URL to more information about the analytics collection.
*/
val policyLink: String,
+
+ /**
+ * The Sentry DSN url.
+ */
+ val sentryDSN: String,
+
+ /**
+ * Environment for Sentry.
+ */
+ val sentryEnvironment: String
) : Analytics
}
diff --git a/vector-config/src/main/java/im/vector/app/config/Config.kt b/vector-config/src/main/java/im/vector/app/config/Config.kt
index f660799d06..c91987dbfd 100644
--- a/vector-config/src/main/java/im/vector/app/config/Config.kt
+++ b/vector-config/src/main/java/im/vector/app/config/Config.kt
@@ -68,25 +68,29 @@ object Config {
* The analytics configuration to use for the Debug build type.
* Can be disabled by providing Analytics.Disabled
*/
- val DEBUG_ANALYTICS_CONFIG = Analytics.PostHog(
+ val DEBUG_ANALYTICS_CONFIG = Analytics.Enabled(
postHogHost = "https://posthog.element.dev",
postHogApiKey = "phc_VtA1L35nw3aeAtHIx1ayrGdzGkss7k1xINeXcoIQzXN",
policyLink = "https://element.io/cookie-policy",
+ sentryDSN = "https://f6acc9cfc2024641b28c87ad95e73e66@sentry.tools.element.io/49",
+ sentryEnvironment = "DEBUG"
)
/**
* The analytics configuration to use for the Release build type.
* Can be disabled by providing Analytics.Disabled
*/
- val RELEASE_ANALYTICS_CONFIG = Analytics.PostHog(
+ val RELEASE_ANALYTICS_CONFIG = Analytics.Enabled(
postHogHost = "https://posthog.hss.element.io",
postHogApiKey = "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
policyLink = "https://element.io/cookie-policy",
+ sentryDSN = "https://f6acc9cfc2024641b28c87ad95e73e66@sentry.tools.element.io/49",
+ sentryEnvironment = "RELEASE"
)
/**
* The analytics configuration to use for the Nightly build type.
* Can be disabled by providing Analytics.Disabled
*/
- val NIGHTLY_ANALYTICS_CONFIG = RELEASE_ANALYTICS_CONFIG
+ val NIGHTLY_ANALYTICS_CONFIG = RELEASE_ANALYTICS_CONFIG.copy(sentryEnvironment = "NIGHTLY")
}
diff --git a/vector/build.gradle b/vector/build.gradle
index ff0d907212..0ddee2428a 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -183,6 +183,7 @@ dependencies {
}
implementation libs.markwon.core
implementation libs.markwon.extLatex
+ implementation libs.markwon.imageGlide
implementation libs.markwon.inlineParser
implementation libs.markwon.html
implementation 'com.googlecode.htmlcompressor:htmlcompressor:1.5.2'
@@ -230,6 +231,7 @@ dependencies {
implementation('com.posthog.android:posthog:1.1.2') {
exclude group: 'com.android.support', module: 'support-annotations'
}
+ implementation libs.sentry.sentryAndroid
// UnifiedPush
implementation 'com.github.UnifiedPush:android-connector:2.1.0'
@@ -289,6 +291,7 @@ dependencies {
testImplementation libs.tests.junit
testImplementation libs.tests.kluent
testImplementation libs.mockk.mockk
+ testImplementation libs.androidx.coreTesting
// Plant Timber tree for test
testImplementation libs.tests.timberJunitRule
testImplementation libs.airbnb.mavericksTesting
@@ -317,5 +320,5 @@ dependencies {
androidTestImplementation libs.mockk.mockkAndroid
androidTestUtil libs.androidx.orchestrator
debugImplementation libs.androidx.fragmentTesting
- androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
+ androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.20"
}
diff --git a/vector/src/androidTest/java/im/vector/app/features/RoomMemberListControllerTest.kt b/vector/src/androidTest/java/im/vector/app/features/RoomMemberListControllerTest.kt
new file mode 100644
index 0000000000..73174e4b34
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/features/RoomMemberListControllerTest.kt
@@ -0,0 +1,128 @@
+/*
+ * 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
+
+import com.airbnb.mvrx.Success
+import im.vector.app.core.epoxy.profiles.ProfileMatrixItemWithPowerLevelWithPresence
+import im.vector.app.features.roomprofile.members.RoomMemberListCategories
+import im.vector.app.features.roomprofile.members.RoomMemberListController
+import im.vector.app.features.roomprofile.members.RoomMemberListViewState
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+class RoomMemberListControllerTest {
+
+ @Test
+ fun testControllerUserVerificationLevel() = runTest {
+ val roomListController = RoomMemberListController(
+ avatarRenderer = mockk {
+ },
+ stringProvider = mockk {
+ every { getString(any()) } answers {
+ this.args[0].toString()
+ }
+ },
+ colorProvider = mockk {
+ every { getColorFromAttribute(any()) } returns 0x0
+ },
+ roomMemberSummaryFilter = mockk(relaxed = true) {
+ every { test(any()) } returns true
+ }
+ )
+
+ val fakeRoomSummary = RoomSummary(
+ roomId = "!roomId",
+ displayName = "Fake Room",
+ topic = "A topic",
+ isEncrypted = true,
+ encryptionEventTs = 0,
+ typingUsers = emptyList(),
+ )
+
+ val state = RoomMemberListViewState(
+ roomId = "!roomId",
+ roomSummary = Success(fakeRoomSummary),
+ areAllMembersLoaded = true,
+ roomMemberSummaries = Success(
+ listOf(
+ RoomMemberListCategories.USER to listOf(
+ RoomMemberSummary(
+ membership = Membership.JOIN,
+ userId = "@alice:example.com"
+ ),
+ RoomMemberSummary(
+ membership = Membership.JOIN,
+ userId = "@bob:example.com"
+ ),
+ RoomMemberSummary(
+ membership = Membership.JOIN,
+ userId = "@carl:example.com"
+ ),
+ RoomMemberSummary(
+ membership = Membership.JOIN,
+ userId = "@massy:example.com"
+ )
+ )
+ )
+ ),
+ trustLevelMap = Success(
+ mapOf(
+ "@alice:example.com" to UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY,
+ "@bob:example.com" to UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED,
+ "@carl:example.com" to UserVerificationLevel.WAS_NEVER_VERIFIED,
+ "@massy:example.com" to UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED,
+ )
+ )
+ )
+
+ suspendCoroutine { continuation ->
+ roomListController.setData(state)
+ roomListController.addModelBuildListener {
+ continuation.resume(it)
+ }
+ }
+
+ val models = roomListController.adapter.copyOfModels
+
+ val profileItems = models.filterIsInstance<ProfileMatrixItemWithPowerLevelWithPresence>()
+
+ profileItems.firstOrNull {
+ it.matrixItem.id == "@alice:example.com"
+ }!!.userVerificationLevel shouldBeEqualTo UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY
+
+ profileItems.firstOrNull {
+ it.matrixItem.id == "@bob:example.com"
+ }!!.userVerificationLevel shouldBeEqualTo UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED
+
+ profileItems.firstOrNull {
+ it.matrixItem.id == "@carl:example.com"
+ }!!.userVerificationLevel shouldBeEqualTo UserVerificationLevel.WAS_NEVER_VERIFIED
+
+ profileItems.firstOrNull {
+ it.matrixItem.id == "@massy:example.com"
+ }!!.userVerificationLevel shouldBeEqualTo UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/features/html/EventHtmlRendererTest.kt b/vector/src/androidTest/java/im/vector/app/features/html/EventHtmlRendererTest.kt
index 41c0f51322..a2e489dd70 100644
--- a/vector/src/androidTest/java/im/vector/app/features/html/EventHtmlRendererTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/html/EventHtmlRendererTest.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.html
import androidx.core.text.toSpannable
import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.utils.toTestSpan
import im.vector.app.features.settings.VectorPreferences
@@ -36,11 +37,13 @@ class EventHtmlRendererTest {
private val fakeVectorPreferences = mockk<VectorPreferences>().also {
every { it.latexMathsIsEnabled() } returns false
}
+ private val fakeSessionHolder = mockk<ActiveSessionHolder>()
private val renderer = EventHtmlRenderer(
MatrixHtmlPluginConfigure(ColorProvider(context), context.resources),
context,
- fakeVectorPreferences
+ fakeVectorPreferences,
+ fakeSessionHolder,
)
@Test
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index b16e4505a6..f079d3429e 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -35,14 +35,6 @@
<!-- To be able to install APK from the application -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
- <!-- Jitsi libs adds CALENDAR permissions, but we can remove them safely according to https://github.com/jitsi/jitsi-meet/issues/4068#issuecomment-480482481 -->
- <uses-permission
- android:name="android.permission.READ_CALENDAR"
- tools:node="remove" />
- <uses-permission
- android:name="android.permission.WRITE_CALENDAR"
- tools:node="remove" />
-
<!-- Location Sharing -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -77,6 +69,9 @@
<application android:supportsRtl="true">
+ <!-- Sentry auto-initialization disable -->
+ <meta-data android:name="io.sentry.auto-init" android:value="false" />
+
<!-- No limit for screen ratio: avoid black strips -->
<meta-data
android:name="android.max_aspect"
diff --git a/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
index a665b619c0..d230e76c1e 100644
--- a/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
+++ b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
@@ -22,6 +22,7 @@ import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.utils.BehaviorDataSource
import im.vector.app.features.analytics.AnalyticsTracker
import im.vector.app.features.analytics.plan.UserProperties
+import im.vector.app.features.analytics.plan.ViewRoom
import im.vector.app.features.session.coroutineScope
import im.vector.app.features.settings.VectorPreferences
import im.vector.app.features.ui.UiStateRepository
@@ -82,6 +83,13 @@ class SpaceStateHandlerImpl @Inject constructor(
return
}
+ analyticsTracker.capture(
+ ViewRoom(
+ isDM = false,
+ isSpace = true,
+ )
+ )
+
if (isForwardNavigation) {
addToBackstack(spaceToLeave, spaceToSet)
}
diff --git a/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt b/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
index a75b3fa46b..caa38d20d9 100644
--- a/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
@@ -44,12 +44,14 @@ object ConfigurationModule {
else -> throw IllegalStateException("Unhandled build type: ${BuildConfig.BUILD_TYPE}")
}
return when (config) {
- Analytics.Disabled -> AnalyticsConfig(isEnabled = false, "", "", "")
- is Analytics.PostHog -> AnalyticsConfig(
+ Analytics.Disabled -> AnalyticsConfig(isEnabled = false, "", "", "", "", "")
+ is Analytics.Enabled -> AnalyticsConfig(
isEnabled = true,
postHogHost = config.postHogHost,
postHogApiKey = config.postHogApiKey,
- policyLink = config.policyLink
+ policyLink = config.policyLink,
+ sentryDSN = config.sentryDSN,
+ sentryEnvironment = config.sentryEnvironment
)
}
}
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 62e7140742..38b62e1511 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
@@ -89,6 +89,7 @@ import im.vector.app.features.settings.crosssigning.CrossSigningSettingsViewMode
import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheetViewModel
import im.vector.app.features.settings.devices.DevicesViewModel
import im.vector.app.features.settings.devices.v2.details.SessionDetailsViewModel
+import im.vector.app.features.settings.devices.v2.more.SessionLearnMoreViewModel
import im.vector.app.features.settings.devices.v2.othersessions.OtherSessionsViewModel
import im.vector.app.features.settings.devices.v2.overview.SessionOverviewViewModel
import im.vector.app.features.settings.devices.v2.rename.RenameSessionViewModel
@@ -659,4 +660,9 @@ interface MavericksViewModelModule {
@IntoMap
@MavericksViewModelKey(RenameSessionViewModel::class)
fun renameSessionViewModelFactory(factory: RenameSessionViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SessionLearnMoreViewModel::class)
+ fun sessionLearnMoreViewModelFactory(factory: SessionLearnMoreViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
}
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
index 9c5ad49339..ef22aba624 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
@@ -26,7 +26,7 @@ import im.vector.app.core.epoxy.onClick
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.features.displayname.getBestName
import im.vector.app.features.home.AvatarRenderer
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
import org.matrix.android.sdk.api.util.MatrixItem
abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder>(@LayoutRes layoutId: Int) : VectorEpoxyModel<T>(layoutId) {
@@ -35,7 +35,7 @@ abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder>(@LayoutRes la
@EpoxyAttribute var editable: Boolean = true
@EpoxyAttribute
- var userEncryptionTrustLevel: RoomEncryptionTrustLevel? = null
+ var userVerificationLevel: UserVerificationLevel? = null
@EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
var clickListener: ClickListener? = null
@@ -53,6 +53,6 @@ abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder>(@LayoutRes la
holder.subtitleView.setTextOrHide(matrixId)
holder.editableView.isVisible = editable
avatarRenderer.render(matrixItem, holder.avatarImageView)
- holder.avatarDecorationImageView.render(userEncryptionTrustLevel)
+ holder.avatarDecorationImageView.renderUser(userVerificationLevel)
}
}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt
index 4642fb8525..1990859668 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt
@@ -24,6 +24,7 @@ import androidx.core.view.isVisible
import im.vector.app.R
import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
class ShieldImageView @JvmOverloads constructor(
context: Context,
@@ -102,6 +103,35 @@ class ShieldImageView @JvmOverloads constructor(
}
}
}
+
+ fun renderUser(userVerificationLevel: UserVerificationLevel?, borderLess: Boolean = false) {
+ isVisible = userVerificationLevel != null
+ when (userVerificationLevel) {
+ UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED -> {
+ contentDescription = context.getString(R.string.a11y_trust_level_trusted)
+ setImageResource(
+ if (borderLess) R.drawable.ic_shield_trusted_no_border
+ else R.drawable.ic_shield_trusted
+ )
+ }
+ UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY,
+ UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED -> {
+ contentDescription = context.getString(R.string.a11y_trust_level_warning)
+ setImageResource(
+ if (borderLess) R.drawable.ic_shield_warning_no_border
+ else R.drawable.ic_shield_warning
+ )
+ }
+ UserVerificationLevel.WAS_NEVER_VERIFIED -> {
+ contentDescription = context.getString(R.string.a11y_trust_level_default)
+ setImageResource(
+ if (borderLess) R.drawable.ic_shield_black_no_border
+ else R.drawable.ic_shield_black
+ )
+ }
+ null -> Unit
+ }
+ }
}
@DrawableRes
diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
index 9ad95d3c55..a287626671 100644
--- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
@@ -42,6 +42,7 @@ val PERMISSIONS_FOR_ROOM_AVATAR = listOf(Manifest.permission.CAMERA)
val PERMISSIONS_FOR_WRITING_FILES = listOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)
val PERMISSIONS_FOR_PICKING_CONTACT = listOf(Manifest.permission.READ_CONTACTS)
val PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING = listOf(Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)
+val PERMISSIONS_FOR_VOICE_BROADCAST = listOf(Manifest.permission.RECORD_AUDIO)
// This is not ideal to store the value like that, but it works
private var permissionDialogDisplayed = false
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index e1e7764f19..1b3a9eb142 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -42,9 +42,10 @@ import im.vector.app.features.analytics.plan.ViewRoom
import im.vector.app.features.home.HomeActivity
import im.vector.app.features.home.ShortcutsHandler
import im.vector.app.features.notifications.NotificationDrawerManager
-import im.vector.app.features.pin.PinCodeStore
import im.vector.app.features.pin.PinLocker
import im.vector.app.features.pin.UnlockedActivity
+import im.vector.app.features.pin.lockscreen.crypto.LockScreenKeyRepository
+import im.vector.app.features.pin.lockscreen.pincode.PinCodeHelper
import im.vector.app.features.popup.PopupAlertManager
import im.vector.app.features.session.VectorSessionStore
import im.vector.app.features.settings.VectorPreferences
@@ -134,10 +135,11 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
@Inject lateinit var vectorPreferences: VectorPreferences
@Inject lateinit var uiStateRepository: UiStateRepository
@Inject lateinit var shortcutsHandler: ShortcutsHandler
- @Inject lateinit var pinCodeStore: PinCodeStore
+ @Inject lateinit var pinCodeHelper: PinCodeHelper
@Inject lateinit var pinLocker: PinLocker
@Inject lateinit var popupAlertManager: PopupAlertManager
@Inject lateinit var vectorAnalytics: VectorAnalytics
+ @Inject lateinit var lockScreenKeyRepository: LockScreenKeyRepository
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -284,9 +286,10 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
vectorPreferences.clearPreferences()
uiStateRepository.reset()
pinLocker.unlock()
- pinCodeStore.deletePinCode()
+ pinCodeHelper.deletePinCode()
vectorAnalytics.onSignOut()
vectorSessionStore.clear()
+ lockScreenKeyRepository.deleteSystemKey()
}
withContext(Dispatchers.IO) {
// On BG thread
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 e1c083db29..9c3ebae641 100644
--- a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
+++ b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
@@ -41,6 +41,7 @@ interface VectorFeatures {
*/
fun isNewAppLayoutFeatureEnabled(): Boolean
fun isNewDeviceManagementEnabled(): Boolean
+ fun isVoiceBroadcastEnabled(): Boolean
}
class DefaultVectorFeatures : VectorFeatures {
@@ -57,4 +58,5 @@ class DefaultVectorFeatures : VectorFeatures {
override fun forceUsageOfOpusEncoder(): Boolean = false
override fun isNewAppLayoutFeatureEnabled(): Boolean = true
override fun isNewDeviceManagementEnabled(): Boolean = false
+ override fun isVoiceBroadcastEnabled(): Boolean = false
}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt
index bffba6fa9c..cc3eed306d 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt
@@ -21,4 +21,6 @@ data class AnalyticsConfig(
val postHogHost: String,
val postHogApiKey: String,
val policyLink: String,
+ val sentryDSN: String,
+ val sentryEnvironment: String
)
diff --git a/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt b/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt
index e5446f438b..0ff04f0854 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt
@@ -17,6 +17,7 @@
package im.vector.app.features.analytics.extensions
import im.vector.app.features.analytics.plan.UserProperties
+import im.vector.app.features.home.room.list.home.header.HomeRoomFilter
import im.vector.app.features.onboarding.FtueUseCase
fun FtueUseCase.toTrackingValue(): UserProperties.FtueUseCaseSelection {
@@ -27,3 +28,12 @@ fun FtueUseCase.toTrackingValue(): UserProperties.FtueUseCaseSelection {
FtueUseCase.SKIP -> UserProperties.FtueUseCaseSelection.Skip
}
}
+
+fun HomeRoomFilter.toTrackingValue(): UserProperties.AllChatsActiveFilter {
+ return when (this) {
+ HomeRoomFilter.ALL -> UserProperties.AllChatsActiveFilter.All
+ HomeRoomFilter.UNREADS -> UserProperties.AllChatsActiveFilter.Unreads
+ HomeRoomFilter.FAVOURITES -> UserProperties.AllChatsActiveFilter.Favourites
+ HomeRoomFilter.PEOPlE -> UserProperties.AllChatsActiveFilter.People
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
index be847dcb7f..553d699d86 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
@@ -41,6 +41,7 @@ private val IGNORED_OPTIONS: Options? = null
@Singleton
class DefaultVectorAnalytics @Inject constructor(
postHogFactory: PostHogFactory,
+ private val sentryFactory: SentryFactory,
analyticsConfig: AnalyticsConfig,
private val analyticsStore: AnalyticsStore,
private val lateInitUserPropertiesFactory: LateInitUserPropertiesFactory,
@@ -94,6 +95,9 @@ class DefaultVectorAnalytics @Inject constructor(
override suspend fun onSignOut() {
// reset the analyticsId
setAnalyticsId("")
+
+ // Close Sentry SDK.
+ sentryFactory.stopSentry()
}
private fun observeAnalyticsId() {
@@ -123,10 +127,20 @@ class DefaultVectorAnalytics @Inject constructor(
Timber.tag(analyticsTag.value).d("User consent updated to $consent")
userConsent = consent
optOutPostHog()
+ initOrStopSentry()
}
.launchIn(globalScope)
}
+ private fun initOrStopSentry() {
+ userConsent?.let {
+ when (it) {
+ true -> sentryFactory.initSentry()
+ false -> sentryFactory.stopSentry()
+ }
+ }
+ }
+
private fun optOutPostHog() {
userConsent?.let { posthog?.optOut(!it) }
}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/SentryFactory.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/SentryFactory.kt
new file mode 100644
index 0000000000..a000f2a77a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/SentryFactory.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.analytics.impl
+
+import android.content.Context
+import im.vector.app.features.analytics.AnalyticsConfig
+import im.vector.app.features.analytics.log.analyticsTag
+import io.sentry.Sentry
+import io.sentry.SentryOptions
+import io.sentry.android.core.SentryAndroid
+import timber.log.Timber
+import javax.inject.Inject
+
+class SentryFactory @Inject constructor(
+ private val context: Context,
+ private val analyticsConfig: AnalyticsConfig,
+) {
+
+ fun initSentry() {
+ Timber.tag(analyticsTag.value).d("Initializing Sentry")
+ if (Sentry.isEnabled()) return
+ SentryAndroid.init(context) { options ->
+ options.dsn = analyticsConfig.sentryDSN
+ options.beforeSend = SentryOptions.BeforeSendCallback { event, _ -> event }
+ options.tracesSampleRate = 1.0
+ options.isEnableUserInteractionTracing = true
+ options.environment = analyticsConfig.sentryEnvironment
+ options.diagnosticLevel
+ }
+ }
+
+ fun stopSentry() {
+ Timber.tag(analyticsTag.value).d("Stopping Sentry")
+ Sentry.close()
+ }
+}
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 c85c3aa6b5..8536b765d4 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
@@ -40,6 +40,7 @@ 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
@@ -75,6 +76,7 @@ class AttachmentTypeSelectorView(
views.attachmentContactButton.configure(Type.CONTACT)
views.attachmentPollButton.configure(Type.POLL)
views.attachmentLocationButton.configure(Type.LOCATION)
+ views.attachmentVoiceBroadcast.configure(Type.VOICE_BROADCAST)
width = LinearLayout.LayoutParams.MATCH_PARENT
height = LinearLayout.LayoutParams.WRAP_CONTENT
animationStyle = 0
@@ -134,6 +136,7 @@ class AttachmentTypeSelectorView(
Type.CONTACT -> views.attachmentContactButton
Type.POLL -> views.attachmentPollButton
Type.LOCATION -> views.attachmentLocationButton
+ Type.VOICE_BROADCAST -> views.attachmentVoiceBroadcast
}.let {
it.isVisible = isVisible
}
@@ -221,6 +224,7 @@ class AttachmentTypeSelectorView(
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)
+ LOCATION(PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING, R.string.tooltip_attachment_location),
+ VOICE_BROADCAST(PERMISSIONS_FOR_VOICE_BROADCAST, R.string.tooltip_attachment_voice_broadcast),
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index c1e3b58a80..10708d2290 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -79,6 +79,7 @@ sealed class RoomDetailAction : VectorViewModelAction {
data class ReRequestKeys(val eventId: String) : RoomDetailAction()
object SelectStickerAttachment : RoomDetailAction()
+ object StartVoiceBroadcast : RoomDetailAction()
object OpenIntegrationManager : RoomDetailAction()
object ManageIntegrations : RoomDetailAction()
data class AddJitsiWidget(val withVideo: Boolean) : RoomDetailAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index bba607eeb4..8a259b0eea 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -359,6 +359,8 @@ class TimelineFragment :
private var lockSendButton = false
private val currentCallsViewPresenter = CurrentCallsViewPresenter()
+ private val isEmojiKeyboardVisible: Boolean
+ get() = vectorPreferences.showEmojiKeyboard()
private val lazyLoadedViews = RoomDetailLazyLoadedViews()
private val emojiPopup: EmojiPopup by lifecycleAwareLazy {
@@ -1536,11 +1538,10 @@ class TimelineFragment :
observerUserTyping()
- if (vectorPreferences.sendMessageWithEnter()) {
- // imeOptions="actionSend" only works with single line, so we remove multiline inputType
- composerEditText.inputType = composerEditText.inputType and EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE.inv()
- composerEditText.imeOptions = EditorInfo.IME_ACTION_SEND
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ composerEditText.setUseIncognitoKeyboard(vectorPreferences.useIncognitoKeyboard())
}
+ composerEditText.setSendMessageWithEnter(vectorPreferences.sendMessageWithEnter())
composerEditText.setOnEditorActionListener { v, actionId, keyEvent ->
val imeActionId = actionId and EditorInfo.IME_MASK_ACTION
@@ -1575,10 +1576,18 @@ class TimelineFragment :
attachmentTypeSelector.setAttachmentVisibility(
AttachmentTypeSelectorView.Type.POLL, !isThreadTimeLine()
)
+ attachmentTypeSelector.setAttachmentVisibility(
+ AttachmentTypeSelectorView.Type.VOICE_BROADCAST,
+ vectorFeatures.isVoiceBroadcastEnabled(), // TODO check user permission
+ )
}
attachmentTypeSelector.show(views.composerLayout.views.attachmentButton)
}
+ override fun onExpandOrCompactChange() {
+ views.composerLayout.views.composerEmojiButton.isVisible = isEmojiKeyboardVisible
+ }
+
override fun onSendMessage(text: CharSequence) {
sendTextMessage(text)
}
@@ -2668,6 +2677,7 @@ class TimelineFragment :
locationOwnerId = session.myUserId
)
}
+ AttachmentTypeSelectorView.Type.VOICE_BROADCAST -> timelineViewModel.handle(RoomDetailAction.StartVoiceBroadcast)
}
}
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 02dd2604e1..4bed477711 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
@@ -456,6 +456,7 @@ class TimelineViewModel @AssistedInject constructor(
is RoomDetailAction.ReRequestKeys -> handleReRequestKeys(action)
is RoomDetailAction.TapOnFailedToDecrypt -> handleTapOnFailedToDecrypt(action)
is RoomDetailAction.SelectStickerAttachment -> handleSelectStickerAttachment()
+ is RoomDetailAction.StartVoiceBroadcast -> handleStartVoiceBroadcast()
is RoomDetailAction.OpenIntegrationManager -> handleOpenIntegrationManager()
is RoomDetailAction.StartCall -> handleStartCall(action)
is RoomDetailAction.AcceptCall -> handleAcceptCall(action)
@@ -597,6 +598,11 @@ class TimelineViewModel @AssistedInject constructor(
}
}
+ private fun handleStartVoiceBroadcast() {
+ // Todo implement start voice broadcast action
+ Timber.d("Start voice broadcast clicked")
+ }
+
private fun handleOpenIntegrationManager() {
viewModelScope.launch {
val viewEvent = withContext(Dispatchers.Default) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
index c751053cdf..9e88882866 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
@@ -20,10 +20,12 @@ package im.vector.app.features.home.room.detail.composer
import android.content.ClipData
import android.content.Context
import android.net.Uri
+import android.os.Build
import android.text.Editable
import android.util.AttributeSet
import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputConnection
+import androidx.annotation.RequiresApi
import androidx.appcompat.widget.AppCompatEditText
import androidx.core.view.OnReceiveContentListener
import androidx.core.view.ViewCompat
@@ -79,6 +81,27 @@ class ComposerEditText @JvmOverloads constructor(
return ic
}
+ /** Set whether the keyboard should disable personalized learning. */
+ @RequiresApi(Build.VERSION_CODES.O)
+ fun setUseIncognitoKeyboard(useIncognitoKeyboard: Boolean) {
+ imeOptions = if (useIncognitoKeyboard) {
+ imeOptions or EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
+ } else {
+ imeOptions and EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING.inv()
+ }
+ }
+
+ /** Set whether enter should send the message or add a new line. */
+ fun setSendMessageWithEnter(sendMessageWithEnter: Boolean) {
+ if (sendMessageWithEnter) {
+ inputType = inputType and EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE.inv()
+ imeOptions = imeOptions or EditorInfo.IME_ACTION_SEND
+ } else {
+ inputType = inputType or EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE
+ imeOptions = imeOptions and EditorInfo.IME_ACTION_SEND.inv()
+ }
+ }
+
init {
addTextChangedListener(
object : SimpleTextWatcher() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
index 1522960cc9..b1b2c87e9c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
@@ -46,6 +46,7 @@ class MessageComposerView @JvmOverloads constructor(
fun onCloseRelatedMessage()
fun onSendMessage(text: CharSequence)
fun onAddAttachment()
+ fun onExpandOrCompactChange()
}
val views: ComposerLayoutBinding
@@ -96,6 +97,7 @@ class MessageComposerView @JvmOverloads constructor(
}
currentConstraintSetId = R.layout.composer_layout_constraint_set_compact
applyNewConstraintSet(animate, transitionComplete)
+ callback?.onExpandOrCompactChange()
}
fun expand(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) {
@@ -105,6 +107,7 @@ class MessageComposerView @JvmOverloads constructor(
}
currentConstraintSetId = R.layout.composer_layout_constraint_set_expanded
applyNewConstraintSet(animate, transitionComplete)
+ callback?.onExpandOrCompactChange()
}
fun setTextIfDifferent(text: CharSequence?): Boolean {
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 28e256c064..fece5786fe 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
@@ -453,12 +453,15 @@ class MessageItemFactory @Inject constructor(
maxWidth = maxWidth,
allowNonMxcUrls = informationData.sendState.isSending()
)
+
+ val playable = messageContent.mimeType == MimeTypes.Gif
+
return MessageImageVideoItem_()
.attributes(attributes)
.leftGuideline(avatarSizeProvider.leftGuideline)
.imageContentRenderer(imageContentRenderer)
.contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
- .playable(messageContent.mimeType == MimeTypes.Gif)
+ .playable(playable)
.highlighted(highlight)
.mediaData(data)
.apply {
@@ -472,6 +475,10 @@ class MessageItemFactory @Inject constructor(
callback?.onImageMessageClicked(messageContent, data, view, emptyList())
}
}
+ }.apply {
+ if (playable && vectorPreferences.autoplayAnimatedImages()) {
+ mode(ImageContentRenderer.Mode.ANIMATED_THUMBNAIL)
+ }
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
index 7f62c68850..33b293497e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
@@ -18,7 +18,7 @@ package im.vector.app.features.home.room.list.home
import android.widget.ImageView
import androidx.lifecycle.LiveData
-import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Observer
import androidx.paging.PagedList
import arrow.core.toOption
@@ -34,6 +34,9 @@ import im.vector.app.core.platform.StateView
import im.vector.app.core.platform.VectorViewModel
import im.vector.app.core.resources.DrawableProvider
import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.extensions.toTrackingValue
+import im.vector.app.features.analytics.plan.UserProperties
import im.vector.app.features.displayname.getBestName
import im.vector.app.features.home.room.list.home.header.HomeRoomFilter
import kotlinx.coroutines.flow.Flow
@@ -74,6 +77,7 @@ class HomeRoomListViewModel @AssistedInject constructor(
private val preferencesStore: HomeLayoutPreferencesStore,
private val stringProvider: StringProvider,
private val drawableProvider: DrawableProvider,
+ private val analyticsTracker: AnalyticsTracker,
) : VectorViewModel<HomeRoomListViewState, HomeRoomListAction, HomeRoomListViewEvents>(initialState) {
@AssistedFactory
@@ -89,7 +93,7 @@ class HomeRoomListViewModel @AssistedInject constructor(
.setEnablePlaceholders(true)
.build()
- private val _roomsLivePagedList = MediatorLiveData<PagedList<RoomSummary>>()
+ private val _roomsLivePagedList = MutableLiveData<PagedList<RoomSummary>>()
val roomsLivePagedList: LiveData<PagedList<RoomSummary>> = _roomsLivePagedList
private val internalPagedListObserver = Observer<PagedList<RoomSummary>> {
@@ -236,9 +240,7 @@ class HomeRoomListViewModel @AssistedInject constructor(
}
private fun observeRooms(currentFilter: HomeRoomFilter, isAZOrdering: Boolean) {
- filteredPagedRoomSummariesLive?.livePagedList?.let { livePagedList ->
- _roomsLivePagedList.removeSource(livePagedList)
- }
+ filteredPagedRoomSummariesLive?.livePagedList?.removeObserver(internalPagedListObserver)
val builder = RoomSummaryQueryParams.Builder().also {
it.memberships = listOf(Membership.JOIN)
it.spaceFilter = spaceStateHandler.getCurrentSpace()?.roomId.toActiveSpaceOrNoFilter()
@@ -256,7 +258,7 @@ class HomeRoomListViewModel @AssistedInject constructor(
).also {
filteredPagedRoomSummariesLive = it
}
- _roomsLivePagedList.addSource(liveResults.livePagedList, internalPagedListObserver)
+ liveResults.livePagedList.observeForever(internalPagedListObserver)
}
private fun observeOrderPreferences() {
@@ -339,9 +341,7 @@ class HomeRoomListViewModel @AssistedInject constructor(
}
override fun onCleared() {
- filteredPagedRoomSummariesLive?.livePagedList?.let { livePagedList ->
- _roomsLivePagedList.removeSource(livePagedList)
- }
+ filteredPagedRoomSummariesLive?.livePagedList?.removeObserver(internalPagedListObserver)
super.onCleared()
}
@@ -358,6 +358,7 @@ class HomeRoomListViewModel @AssistedInject constructor(
}
setState { copy(headersData = headersData.copy(currentFilter = newFilter)) }
updateEmptyState()
+ analyticsTracker.updateUserProperties(UserProperties(allChatsActiveFilter = newFilter.toTrackingValue()))
filteredPagedRoomSummariesLive?.let { liveResults ->
liveResults.queryParams = getFilteredQueryParams(newFilter, liveResults.queryParams)
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomsHeadersController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomsHeadersController.kt
index 56cccd9c36..3cc058985a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomsHeadersController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomsHeadersController.kt
@@ -28,6 +28,7 @@ import com.google.android.material.color.MaterialColors
import im.vector.app.R
import im.vector.app.core.resources.StringProvider
import im.vector.app.core.utils.FirstItemUpdatedObserver
+import im.vector.app.features.analytics.AnalyticsTracker
import im.vector.app.features.home.AvatarRenderer
import im.vector.app.features.home.room.list.RoomListListener
import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -38,6 +39,7 @@ class HomeRoomsHeadersController @Inject constructor(
val stringProvider: StringProvider,
private val avatarRenderer: AvatarRenderer,
resources: Resources,
+ private val analyticsTracker: AnalyticsTracker,
) : EpoxyController() {
private var data: RoomsHeadersData = RoomsHeadersData()
@@ -73,7 +75,11 @@ class HomeRoomsHeadersController @Inject constructor(
}
host.data.filtersList?.let {
- addRoomFilterHeaderItem(host.onFilterChangedListener, it, host.data.currentFilter)
+ addRoomFilterHeaderItem(
+ filterChangedListener = host.onFilterChangedListener,
+ filtersList = it,
+ currentFilter = host.data.currentFilter,
+ analyticsTracker = analyticsTracker)
}
}
@@ -158,12 +164,14 @@ class HomeRoomsHeadersController @Inject constructor(
filterChangedListener: ((HomeRoomFilter) -> Unit)?,
filtersList: List<HomeRoomFilter>,
currentFilter: HomeRoomFilter?,
+ analyticsTracker: AnalyticsTracker,
) {
roomFilterHeaderItem {
id("filter_header")
filtersData(filtersList)
selectedFilter(currentFilter)
onFilterChangedListener(filterChangedListener)
+ analyticsTracker(analyticsTracker)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomFilterHeaderItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomFilterHeaderItem.kt
index ed99b51681..fd4333b722 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomFilterHeaderItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomFilterHeaderItem.kt
@@ -22,6 +22,8 @@ import com.google.android.material.tabs.TabLayout
import im.vector.app.R
import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.plan.Interaction
@EpoxyModelClass
abstract class RoomFilterHeaderItem : VectorEpoxyModel<RoomFilterHeaderItem.Holder>(R.layout.item_home_filter_tabs) {
@@ -35,6 +37,9 @@ abstract class RoomFilterHeaderItem : VectorEpoxyModel<RoomFilterHeaderItem.Hold
@EpoxyAttribute
var selectedFilter: HomeRoomFilter? = null
+ @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+ var analyticsTracker: AnalyticsTracker? = null
+
override fun bind(holder: Holder) {
super.bind(holder)
with(holder.tabLayout) {
@@ -51,6 +56,7 @@ abstract class RoomFilterHeaderItem : VectorEpoxyModel<RoomFilterHeaderItem.Hold
addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
override fun onTabSelected(tab: TabLayout.Tab?) {
(tab?.tag as? HomeRoomFilter)?.let { filter ->
+ trackFilterChangeEvent(filter)
onFilterChangedListener?.invoke(filter)
}
}
@@ -61,6 +67,23 @@ abstract class RoomFilterHeaderItem : VectorEpoxyModel<RoomFilterHeaderItem.Hold
}
}
+ private fun trackFilterChangeEvent(filter: HomeRoomFilter) {
+ val interactionName = when (filter) {
+ HomeRoomFilter.ALL -> Interaction.Name.MobileAllChatsFilterAll
+ HomeRoomFilter.UNREADS -> Interaction.Name.MobileAllChatsFilterUnreads
+ HomeRoomFilter.FAVOURITES -> Interaction.Name.MobileAllChatsFilterFavourites
+ HomeRoomFilter.PEOPlE -> Interaction.Name.MobileAllChatsFilterPeople
+ }
+
+ analyticsTracker?.capture(
+ Interaction(
+ index = null,
+ interactionType = null,
+ name = interactionName
+ )
+ )
+ }
+
override fun unbind(holder: Holder) {
holder.tabLayout.clearOnTabSelectedListeners()
super.unbind(holder)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesFragment.kt
index 0dbc1b8f34..ac39d7d567 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesFragment.kt
@@ -27,6 +27,7 @@ import im.vector.app.core.extensions.configureWith
import im.vector.app.core.platform.StateView
import im.vector.app.core.platform.VectorBaseFragment
import im.vector.app.databinding.FragmentInvitesBinding
+import im.vector.app.features.analytics.plan.MobileScreen
import im.vector.app.features.analytics.plan.ViewRoom
import im.vector.app.features.home.room.list.RoomListListener
import im.vector.app.features.notifications.NotificationDrawerManager
@@ -48,6 +49,11 @@ class InvitesFragment : VectorBaseFragment<FragmentInvitesBinding>(), RoomListLi
return FragmentInvitesBinding.inflate(inflater, container, false)
}
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ analyticsScreenName = MobileScreen.ScreenName.Invites
+ }
+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/layout/HomeLayoutSettingBottomDialogFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/layout/HomeLayoutSettingBottomDialogFragment.kt
index 0c4d64a1cc..63b7f557e3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/layout/HomeLayoutSettingBottomDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/layout/HomeLayoutSettingBottomDialogFragment.kt
@@ -25,6 +25,7 @@ import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
import im.vector.app.databinding.BottomSheetHomeLayoutSettingsBinding
+import im.vector.app.features.analytics.plan.Interaction
import im.vector.app.features.home.room.list.home.HomeLayoutPreferencesStore
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
@@ -54,9 +55,11 @@ class HomeLayoutSettingBottomDialogFragment : VectorBaseBottomSheetDialogFragmen
}
views.homeLayoutSettingsRecents.setOnCheckedChangeListener { _, isChecked ->
+ trackRecentsStateEvent(isChecked)
setRecentsEnabled(isChecked)
}
views.homeLayoutSettingsFilters.setOnCheckedChangeListener { _, isChecked ->
+ trackFiltersStateEvent(isChecked)
setFiltersEnabled(isChecked)
}
views.homeLayoutSettingsSortGroup.setOnCheckedChangeListener { _, checkedId ->
@@ -64,10 +67,40 @@ class HomeLayoutSettingBottomDialogFragment : VectorBaseBottomSheetDialogFragmen
}
}
+ private fun trackRecentsStateEvent(areEnabled: Boolean) {
+ val interactionName = if (areEnabled) {
+ Interaction.Name.MobileAllChatsRecentsEnabled
+ } else {
+ Interaction.Name.MobileAllChatsRecentsDisabled
+ }
+ analyticsTracker.capture(
+ Interaction(
+ index = null,
+ interactionType = null,
+ name = interactionName
+ )
+ )
+ }
+
private fun setRecentsEnabled(isEnabled: Boolean) = lifecycleScope.launch {
preferencesStore.setRecentsEnabled(isEnabled)
}
+ private fun trackFiltersStateEvent(areEnabled: Boolean) {
+ val interactionName = if (areEnabled) {
+ Interaction.Name.MobileAllChatsFiltersEnabled
+ } else {
+ Interaction.Name.MobileAllChatsFiltersDisabled
+ }
+ analyticsTracker.capture(
+ Interaction(
+ index = null,
+ interactionType = null,
+ name = interactionName
+ )
+ )
+ }
+
private fun setFiltersEnabled(isEnabled: Boolean) = lifecycleScope.launch {
preferencesStore.setFiltersEnabled(isEnabled)
}
diff --git a/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
index 725f23cddd..9e869ecde1 100644
--- a/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
@@ -27,8 +27,13 @@ package im.vector.app.features.html
import android.content.Context
import android.content.res.Resources
+import android.graphics.drawable.Drawable
import android.text.Spannable
import androidx.core.text.toSpannable
+import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.request.target.Target
+import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.utils.DimensionConverter
import im.vector.app.features.settings.VectorPreferences
@@ -39,12 +44,15 @@ import io.noties.markwon.PrecomputedFutureTextSetterCompat
import io.noties.markwon.ext.latex.JLatexMathPlugin
import io.noties.markwon.ext.latex.JLatexMathTheme
import io.noties.markwon.html.HtmlPlugin
+import io.noties.markwon.image.AsyncDrawable
+import io.noties.markwon.image.glide.GlideImagesPlugin
import io.noties.markwon.inlineparser.EntityInlineProcessor
import io.noties.markwon.inlineparser.HtmlInlineProcessor
import io.noties.markwon.inlineparser.MarkwonInlineParser
import io.noties.markwon.inlineparser.MarkwonInlineParserPlugin
import org.commonmark.node.Node
import org.commonmark.parser.Parser
+import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
import timber.log.Timber
import javax.inject.Inject
import javax.inject.Singleton
@@ -53,7 +61,8 @@ import javax.inject.Singleton
class EventHtmlRenderer @Inject constructor(
htmlConfigure: MatrixHtmlPluginConfigure,
context: Context,
- vectorPreferences: VectorPreferences
+ vectorPreferences: VectorPreferences,
+ private val activeSessionHolder: ActiveSessionHolder
) {
interface PostProcessor {
@@ -62,6 +71,23 @@ class EventHtmlRenderer @Inject constructor(
private val builder = Markwon.builder(context)
.usePlugin(HtmlPlugin.create(htmlConfigure))
+ .usePlugin(GlideImagesPlugin.create(object : GlideImagesPlugin.GlideStore {
+ override fun load(drawable: AsyncDrawable): RequestBuilder<Drawable> {
+ val url = drawable.destination
+ if (url.isMxcUrl()) {
+ val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
+ val imageUrl = contentUrlResolver.resolveFullSize(url)
+ // Override size to avoid crashes for huge pictures
+ return Glide.with(context).load(imageUrl).override(500)
+ }
+ // We don't want to support other url schemes here, so just return a request for null
+ return Glide.with(context).load(null as String?)
+ }
+
+ override fun cancel(target: Target<*>) {
+ Glide.with(context).clear(target)
+ }
+ }))
private val markwon = if (vectorPreferences.latexMathsIsEnabled()) {
// If latex maths is enabled in app preferences, refomat it so Markwon recognises it
diff --git a/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt b/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
index c884843f5c..5bdd92dcf4 100644
--- a/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
+++ b/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
@@ -33,6 +33,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.extensions.tryOrNull
import timber.log.Timber
class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager: PopupAlertManager) : Application.ActivityLifecycleCallbacks {
@@ -58,6 +59,26 @@ class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager
override fun onActivityStopped(activity: Activity) {}
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+ if (activitiesInfo.isEmpty()) {
+ val context = activity.applicationContext
+ val packageManager: PackageManager = context.packageManager
+
+ // Get all activities from element android
+ activitiesInfo = packageManager.getPackageInfo(context.packageName, PackageManager.GET_ACTIVITIES).activities
+
+ // Get all activities from PermissionController module
+ // See https://source.android.com/docs/core/architecture/modular-system/permissioncontroller#package-format
+ if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) {
+ activitiesInfo += tryOrNull {
+ packageManager.getPackageInfo("com.google.android.permissioncontroller", PackageManager.GET_ACTIVITIES).activities
+ } ?: tryOrNull {
+ packageManager.getModuleInfo("com.google.android.permission", 1).packageName?.let {
+ packageManager.getPackageInfo(it, PackageManager.GET_ACTIVITIES or PackageManager.MATCH_APEX).activities
+ }
+ }.orEmpty()
+ }
+ }
+
// restart the app if the task contains an unknown activity
coroutineScope.launch {
val isTaskCorrupted = try {
@@ -92,12 +113,6 @@ class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager
*/
private suspend fun isTaskCorrupted(activity: Activity): Boolean = withContext(Dispatchers.Default) {
val context = activity.applicationContext
- val packageManager: PackageManager = context.packageManager
-
- // Get all activities from app manifest
- if (activitiesInfo.isEmpty()) {
- activitiesInfo = packageManager.getPackageInfo(context.packageName, PackageManager.GET_ACTIVITIES).activities
- }
// Get all running activities on app task
// and compare to activities declared in manifest
@@ -122,7 +137,7 @@ class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager
runningTaskInfo.topActivity?.let {
// Check whether the activity task affinity matches with app task affinity.
// The activity is considered safe when its task affinity doesn't correspond to app task affinity.
- if (packageManager.getActivityInfo(it, 0).taskAffinity == context.applicationInfo.taskAffinity) {
+ if (context.packageManager.getActivityInfo(it, 0).taskAffinity == context.applicationInfo.taskAffinity) {
isPotentialMaliciousActivity(it)
} else false
} ?: false
diff --git a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
index daaf3a19ec..baad815df2 100644
--- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
@@ -38,7 +38,6 @@ import im.vector.app.core.glide.GlideRequest
import im.vector.app.core.glide.GlideRequests
import im.vector.app.core.ui.model.Size
import im.vector.app.core.utils.DimensionConverter
-import im.vector.app.features.settings.VectorPreferences
import kotlinx.parcelize.Parcelize
import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.session.content.ContentUrlResolver
@@ -65,7 +64,6 @@ class ImageContentRenderer @Inject constructor(
private val localFilesHelper: LocalFilesHelper,
private val activeSessionHolder: ActiveSessionHolder,
private val dimensionConverter: DimensionConverter,
- private val vectorPreferences: VectorPreferences
) {
@Parcelize
@@ -85,6 +83,7 @@ class ImageContentRenderer @Inject constructor(
enum class Mode {
FULL_SIZE,
+ ANIMATED_THUMBNAIL,
THUMBNAIL,
STICKER
}
@@ -133,7 +132,7 @@ class ImageContentRenderer @Inject constructor(
createGlideRequest(data, mode, imageView, size)
.let {
- if (vectorPreferences.autoplayAnimatedImages()) it
+ if (mode == Mode.ANIMATED_THUMBNAIL) it
else it.dontAnimate()
}
.transform(cornerTransformation)
@@ -231,6 +230,7 @@ class ImageContentRenderer @Inject constructor(
val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
val resolvedUrl = when (mode) {
Mode.FULL_SIZE,
+ Mode.ANIMATED_THUMBNAIL,
Mode.STICKER -> resolveUrl(data)
Mode.THUMBNAIL -> contentUrlResolver.resolveThumbnail(data.url, size.width, size.height, ContentUrlResolver.ThumbnailMethod.SCALE)
}
@@ -269,6 +269,7 @@ class ImageContentRenderer @Inject constructor(
finalHeight = height
finalWidth = width
}
+ Mode.ANIMATED_THUMBNAIL,
Mode.THUMBNAIL -> {
finalHeight = min(maxImageWidth * height / width, maxImageHeight)
finalWidth = finalHeight * width / height
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index 2894cd4621..65d28a5ceb 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -59,7 +59,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorPr
import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
import im.vector.app.features.roommemberprofile.powerlevel.EditPowerLevelDialogs
import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
import org.matrix.android.sdk.api.session.room.powerlevels.Role
import org.matrix.android.sdk.api.util.MatrixItem
import javax.inject.Inject
@@ -235,23 +235,27 @@ class RoomMemberProfileFragment :
if (state.userMXCrossSigningInfo.isTrusted()) {
// User is trusted
if (state.allDevicesAreCrossSignedTrusted) {
- RoomEncryptionTrustLevel.Trusted
+ UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED
} else {
- RoomEncryptionTrustLevel.Warning
+ UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED
}
} else {
- RoomEncryptionTrustLevel.Default
+ if (state.userMXCrossSigningInfo.wasTrustedOnce) {
+ UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY
+ } else {
+ UserVerificationLevel.WAS_NEVER_VERIFIED
+ }
}
} else {
// Legacy
if (state.allDevicesAreTrusted) {
- RoomEncryptionTrustLevel.Trusted
+ UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED
} else {
- RoomEncryptionTrustLevel.Warning
+ UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED
}
}
- headerViews.memberProfileDecorationImageView.render(trustLevel)
- views.matrixProfileDecorationToolbarAvatarImageView.render(trustLevel)
+ headerViews.memberProfileDecorationImageView.renderUser(trustLevel)
+ views.matrixProfileDecorationToolbarAvatarImageView.renderUser(trustLevel)
} else {
headerViews.memberProfileDecorationImageView.isVisible = false
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
index 22b040b4c0..44bac1c8a0 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
@@ -27,4 +27,5 @@ sealed class RoomProfileAction : VectorViewModelAction {
object ShareRoomProfile : RoomProfileAction()
object CreateShortcut : RoomProfileAction()
object RestoreEncryptionState : RoomProfileAction()
+ data class SetEncryptToVerifiedDeviceOnly(val enabled: Boolean) : RoomProfileAction()
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 06f56bff89..eb43a345f2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -27,6 +27,7 @@ import im.vector.app.core.resources.DrawableProvider
import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.core.ui.list.genericPositiveButtonItem
+import im.vector.app.features.form.formSwitchItem
import im.vector.app.features.home.ShortcutCreator
import im.vector.app.features.home.room.detail.timeline.TimelineEventController
import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
@@ -66,6 +67,8 @@ class RoomProfileController @Inject constructor(
fun onUrlInTopicLongClicked(url: String)
fun doMigrateToVersion(newVersion: String)
fun restoreEncryptionState()
+ fun setEncryptedToVerifiedDevicesOnly(enabled: Boolean)
+ fun openGlobalBlockSettings()
}
override fun buildModels(data: RoomProfileViewState?) {
@@ -175,6 +178,53 @@ class RoomProfileController @Inject constructor(
}
buildEncryptionAction(data.actionPermissions, roomSummary)
+ if (roomSummary.isEncrypted && !encryptionMisconfigured) {
+ data.globalCryptoConfig.invoke()?.let { globalConfig ->
+ if (globalConfig.globalBlockUnverifiedDevices) {
+ genericFooterItem {
+ id("globalConfig")
+ centered(false)
+ text(
+ span {
+ +host.stringProvider.getString(R.string.room_settings_global_block_unverified_info_text)
+ apply {
+ if (data.unverifiedDevicesInTheRoom.invoke() == true) {
+ +"\n"
+ +host.stringProvider.getString(R.string.some_devices_will_not_be_able_to_decrypt)
+ }
+ }
+ }.toEpoxyCharSequence()
+ )
+ itemClickAction {
+ host.callback?.openGlobalBlockSettings()
+ }
+ }
+ } else {
+ // per room setting is available
+ val shouldBlockUnverified = data.encryptToVerifiedDeviceOnly.invoke()
+ formSwitchItem {
+ id("send_to_unverified")
+ enabled(shouldBlockUnverified != null)
+ title(host.stringProvider.getString(R.string.encryption_never_send_to_unverified_devices_in_room))
+
+ switchChecked(shouldBlockUnverified ?: false)
+
+ apply {
+ if (shouldBlockUnverified == true && data.unverifiedDevicesInTheRoom.invoke() == true) {
+ summary(
+ host.stringProvider.getString(R.string.some_devices_will_not_be_able_to_decrypt)
+ )
+ } else {
+ summary(null)
+ }
+ }
+ listener { value ->
+ host.callback?.setEncryptedToVerifiedDevicesOnly(value)
+ }
+ }
+ }
+ }
+ }
// More
buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
buildProfileAction(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 4135ab3d1c..f4394111ab 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -53,6 +53,7 @@ import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
import im.vector.app.features.home.room.detail.upgrade.MigrateRoomBottomSheet
import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction
import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
+import im.vector.app.features.navigation.SettingsActivityPayload
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.parcelize.Parcelize
@@ -346,6 +347,14 @@ class RoomProfileFragment :
)
}
+ override fun setEncryptedToVerifiedDevicesOnly(enabled: Boolean) {
+ roomProfileViewModel.handle(RoomProfileAction.SetEncryptToVerifiedDeviceOnly(enabled))
+ }
+
+ override fun openGlobalBlockSettings() {
+ navigator.openSettings(requireContext(), SettingsActivityPayload.SecurityPrivacy)
+ }
+
private fun onAvatarClicked(view: View) = withState(roomProfileViewModel) { state ->
state.roomSummary()?.toMatrixItem()?.let { matrixItem ->
navigator.openBigImageViewer(requireActivity(), view, matrixItem)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
index 30664c5618..215a1e1e9c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
@@ -17,6 +17,7 @@
package im.vector.app.features.roomprofile
+import androidx.lifecycle.asFlow
import com.airbnb.mvrx.MavericksViewModelFactory
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
@@ -32,7 +33,11 @@ import im.vector.app.features.home.ShortcutCreator
import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
import im.vector.app.features.session.coroutineScope
import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.query.QueryStringValue
@@ -76,6 +81,45 @@ class RoomProfileViewModel @AssistedInject constructor(
observeBannedRoomMembers(flowRoom)
observePermissions()
observePowerLevels()
+ observeCryptoSettings(flowRoom)
+ }
+
+ private fun observeCryptoSettings(flowRoom: FlowRoom) {
+ val perRoomBlockStatus = session.cryptoService().getLiveBlockUnverifiedDevices(initialState.roomId)
+ .asFlow()
+
+ perRoomBlockStatus
+ .execute {
+ copy(encryptToVerifiedDeviceOnly = it)
+ }
+
+ val globalBlockStatus = session.cryptoService().getLiveGlobalCryptoConfig()
+ .asFlow()
+
+ globalBlockStatus
+ .execute {
+ copy(globalCryptoConfig = it)
+ }
+
+ perRoomBlockStatus.combine(globalBlockStatus) { perRoom, global ->
+ perRoom || global.globalBlockUnverifiedDevices
+ }.flatMapLatest {
+ if (it) {
+ flowRoom.liveRoomMembers(roomMemberQueryParams { memberships = Membership.activeMemberships() })
+ .map { it.map { it.userId } }
+ .flatMapLatest {
+ session.cryptoService().getLiveCryptoDeviceInfo(it).asFlow()
+ }
+ } else {
+ flowOf(emptyList())
+ }
+ }.map {
+ it.isNotEmpty()
+ }.execute {
+ copy(
+ unverifiedDevicesInTheRoom = it
+ )
+ }
}
private fun observePowerLevels() {
@@ -141,6 +185,7 @@ class RoomProfileViewModel @AssistedInject constructor(
is RoomProfileAction.ShareRoomProfile -> handleShareRoomProfile()
RoomProfileAction.CreateShortcut -> handleCreateShortcut()
RoomProfileAction.RestoreEncryptionState -> restoreEncryptionState()
+ is RoomProfileAction.SetEncryptToVerifiedDeviceOnly -> setEncryptToVerifiedDeviceOnly(action.enabled)
}
}
@@ -212,6 +257,12 @@ class RoomProfileViewModel @AssistedInject constructor(
}
}
+ private fun setEncryptToVerifiedDeviceOnly(enabled: Boolean) {
+ session.coroutineScope.launch {
+ session.cryptoService().setRoomBlockUnverifiedDevices(room.roomId, enabled)
+ }
+ }
+
private fun restoreEncryptionState() {
_viewEvents.post(RoomProfileViewEvents.Loading())
session.coroutineScope.launch {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
index 87db15ea3b..5393ceb152 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
@@ -20,6 +20,7 @@ package im.vector.app.features.roomprofile
import com.airbnb.mvrx.Async
import com.airbnb.mvrx.MavericksState
import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
import org.matrix.android.sdk.api.session.room.model.RoomSummary
import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
@@ -35,7 +36,10 @@ data class RoomProfileViewState(
val recommendedRoomVersion: String? = null,
val canUpgradeRoom: Boolean = false,
val isTombstoned: Boolean = false,
- val canUpdateRoomState: Boolean = false
+ val canUpdateRoomState: Boolean = false,
+ val encryptToVerifiedDeviceOnly: Async<Boolean> = Uninitialized,
+ val globalCryptoConfig: Async<GlobalCryptoConfig> = Uninitialized,
+ val unverifiedDevicesInTheRoom: Async<Boolean> = Uninitialized,
) : MavericksState {
constructor(args: RoomProfileArgs) : this(roomId = args.roomId)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index 8f310a6a89..9adfeb2a0e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -129,7 +129,7 @@ class RoomMemberListController @Inject constructor(
id(roomMember.userId)
matrixItem(roomMember.toMatrixItem())
avatarRenderer(host.avatarRenderer)
- userEncryptionTrustLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
+ userVerificationLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
clickListener {
host.callback?.onRoomMemberClicked(roomMember)
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index 915ce51d91..9ddcde7e4a 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -37,7 +37,8 @@ import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.extensions.orFalse
import org.matrix.android.sdk.api.query.QueryStringValue
import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.events.model.toModel
import org.matrix.android.sdk.api.session.getRoom
@@ -116,14 +117,7 @@ class RoomMemberListViewModel @AssistedInject constructor(
.map { deviceList ->
// If any key change, emit the userIds list
deviceList.groupBy { it.userId }.mapValues {
- val allDeviceTrusted = it.value.fold(it.value.isNotEmpty()) { prev, next ->
- prev && next.trustLevel?.isCrossSigningVerified().orFalse()
- }
- if (session.cryptoService().crossSigningService().getUserCrossSigningKeys(it.key)?.isTrusted().orFalse()) {
- if (allDeviceTrusted) RoomEncryptionTrustLevel.Trusted else RoomEncryptionTrustLevel.Warning
- } else {
- RoomEncryptionTrustLevel.Default
- }
+ getUserTrustLevel(it.key, it.value)
}
}
}
@@ -133,6 +127,29 @@ class RoomMemberListViewModel @AssistedInject constructor(
}
}
+ private fun getUserTrustLevel(userId: String, devices: List<CryptoDeviceInfo>): UserVerificationLevel {
+ val allDeviceTrusted = devices.fold(devices.isNotEmpty()) { prev, next ->
+ prev && next.trustLevel?.isCrossSigningVerified().orFalse()
+ }
+ val mxCrossSigningInfo = session.cryptoService().crossSigningService().getUserCrossSigningKeys(userId)
+ return when {
+ mxCrossSigningInfo == null -> {
+ UserVerificationLevel.WAS_NEVER_VERIFIED
+ }
+ mxCrossSigningInfo.isTrusted() -> {
+ if (allDeviceTrusted) UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED
+ else UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED
+ }
+ else -> {
+ if (mxCrossSigningInfo.wasTrustedOnce) {
+ UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY
+ } else {
+ UserVerificationLevel.WAS_NEVER_VERIFIED
+ }
+ }
+ }
+ }
+
private fun observePowerLevel() {
PowerLevelsFlowFactory(room).createFlow()
.onEach {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
index 3cea47e60d..7861970c28 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
@@ -23,7 +23,7 @@ import com.airbnb.mvrx.Uninitialized
import im.vector.app.R
import im.vector.app.core.platform.GenericIdArgs
import im.vector.app.features.roomprofile.RoomProfileArgs
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
import org.matrix.android.sdk.api.session.events.model.Event
import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -36,7 +36,7 @@ data class RoomMemberListViewState(
val ignoredUserIds: List<String> = emptyList(),
val filter: String = "",
val threePidInvites: Async<List<Event>> = Uninitialized,
- val trustLevelMap: Async<Map<String, RoomEncryptionTrustLevel?>> = Uninitialized,
+ val trustLevelMap: Async<Map<String, UserVerificationLevel>> = Uninitialized,
val actionsPermissions: ActionPermissions = ActionPermissions()
) : MavericksState {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index 81e98335c0..10465b03ea 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -45,7 +45,7 @@ data class RoomSettingsViewState(
val showSaveAction: Boolean = false,
val actionPermissions: ActionPermissions = ActionPermissions(),
val supportsRestricted: Boolean = false,
- val canUpgradeToRestricted: Boolean = false
+ val canUpgradeToRestricted: Boolean = false,
) : MavericksState {
constructor(args: RoomProfileArgs) : this(roomId = args.roomId)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 16d3210b45..b7812b9ebb 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -87,6 +87,7 @@ class VectorPreferences @Inject constructor(
const val SETTINGS_INTEGRATION_MANAGER_UI_URL_KEY = "SETTINGS_INTEGRATION_MANAGER_UI_URL_KEY"
const val SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY = "SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY"
const val SETTINGS_PERSISTED_SPACE_BACKSTACK = "SETTINGS_PERSISTED_SPACE_BACKSTACK"
+ const val SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY = "SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY"
const val SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT = "SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT"
// const val SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY = "SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY"
@@ -288,6 +289,7 @@ class VectorPreferences @Inject constructor(
SETTINGS_USE_RAGE_SHAKE_KEY,
SETTINGS_SECURITY_USE_FLAG_SECURE,
+ SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY,
ShortcutsHandler.SHARED_PREF_KEY,
)
@@ -969,6 +971,11 @@ class VectorPreferences @Inject constructor(
return defaultPrefs.getBoolean(SETTINGS_SECURITY_USE_FLAG_SECURE, false)
}
+ /** Whether the keyboard should disable personalized learning. */
+ fun useIncognitoKeyboard(): Boolean {
+ return defaultPrefs.getBoolean(SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY, false)
+ }
+
/**
* The user enable protecting app access with pin code.
* Currently we use the pin code store to know if the pin is enabled, so this is not used
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index 5cbdf114a5..87f5af67eb 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -20,6 +20,7 @@ package im.vector.app.features.settings
import android.app.Activity
import android.content.Intent
import android.net.Uri
+import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@@ -160,6 +161,10 @@ class VectorSettingsSecurityPrivacyFragment :
findPreference<VectorSwitchPreference>("SETTINGS_USER_ANALYTICS_CONSENT_KEY")!!
}
+ private val incognitoKeyboardPref by lazy {
+ findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY)!!
+ }
+
override fun onCreateRecyclerView(inflater: LayoutInflater, parent: ViewGroup, savedInstanceState: Bundle?): RecyclerView {
return super.onCreateRecyclerView(inflater, parent, savedInstanceState).also {
// Insert animation are really annoying the first time the list is shown
@@ -275,6 +280,9 @@ class VectorSettingsSecurityPrivacyFragment :
// Analytics
setUpAnalytics()
+ // Incognito Keyboard
+ setUpIncognitoKeyboard()
+
// Pin code
openPinCodeSettingsPref.setOnPreferenceClickListener {
openPinCodePreferenceScreen()
@@ -337,6 +345,10 @@ class VectorSettingsSecurityPrivacyFragment :
}
}
+ private fun setUpIncognitoKeyboard() {
+ incognitoKeyboardPref.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+ }
+
// Todo this should be refactored and use same state as 4S section
private fun refreshXSigningStatus() {
val crossSigningKeys = session.cryptoService().crossSigningService().getMyCrossSigningKeys()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceExtendedInfo.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceExtendedInfo.kt
new file mode 100644
index 0000000000..24e4606ca7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceExtendedInfo.kt
@@ -0,0 +1,42 @@
+/*
+ * 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
+
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+
+data class DeviceExtendedInfo(
+ /**
+ * One of MOBILE, WEB, DESKTOP or UNKNOWN.
+ */
+ val deviceType: DeviceType,
+ /**
+ * i.e. Google Pixel 6.
+ */
+ val deviceModel: String? = null,
+ /**
+ * i.e. Android 11.
+ */
+ val deviceOperatingSystem: String? = null,
+ /**
+ * i.e. Element Nightly.
+ */
+ val clientName: String? = null,
+ /**
+ * i.e. 1.5.0.
+ */
+ val clientVersion: String? = null,
+)
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 373df53b1b..445eb6226f 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
@@ -26,4 +26,5 @@ data class DeviceFullInfo(
val roomEncryptionTrustLevel: RoomEncryptionTrustLevel,
val isInactive: Boolean,
val isCurrentDevice: Boolean,
+ val deviceExtendedInfo: DeviceExtendedInfo,
)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCase.kt
index b2341e23f7..0272bea351 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCase.kt
@@ -38,6 +38,7 @@ class GetDeviceFullInfoListUseCase @Inject constructor(
private val getEncryptionTrustLevelForDeviceUseCase: GetEncryptionTrustLevelForDeviceUseCase,
private val getCurrentSessionCrossSigningInfoUseCase: GetCurrentSessionCrossSigningInfoUseCase,
private val filterDevicesUseCase: FilterDevicesUseCase,
+ private val parseDeviceUserAgentUseCase: ParseDeviceUserAgentUseCase,
) {
fun execute(filterType: DeviceManagerFilterType, excludeCurrentDevice: Boolean = false): Flow<List<DeviceFullInfo>> {
@@ -72,7 +73,8 @@ class GetDeviceFullInfoListUseCase @Inject constructor(
val roomEncryptionTrustLevel = getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo)
val isInactive = checkIfSessionIsInactiveUseCase.execute(deviceInfo.lastSeenTs ?: 0)
val isCurrentDevice = currentSessionCrossSigningInfo.deviceId == cryptoDeviceInfo?.deviceId
- DeviceFullInfo(deviceInfo, cryptoDeviceInfo, roomEncryptionTrustLevel, isInactive, isCurrentDevice)
+ val deviceUserAgent = parseDeviceUserAgentUseCase.execute(deviceInfo.getBestLastSeenUserAgent())
+ DeviceFullInfo(deviceInfo, cryptoDeviceInfo, roomEncryptionTrustLevel, isInactive, isCurrentDevice, deviceUserAgent)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCase.kt
new file mode 100644
index 0000000000..f5f1782d82
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCase.kt
@@ -0,0 +1,192 @@
+/*
+ * 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
+
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import org.matrix.android.sdk.api.extensions.orFalse
+import javax.inject.Inject
+
+class ParseDeviceUserAgentUseCase @Inject constructor() {
+
+ fun execute(userAgent: String?): DeviceExtendedInfo {
+ if (userAgent == null) return createUnknownUserAgent()
+
+ return when {
+ userAgent.contains(ANDROID_KEYWORD) -> parseAndroidUserAgent(userAgent)
+ userAgent.contains(IOS_KEYWORD) -> parseIosUserAgent(userAgent)
+ userAgent.contains(DESKTOP_KEYWORD) -> parseDesktopUserAgent(userAgent)
+ userAgent.contains(WEB_KEYWORD) -> parseWebUserAgent(userAgent)
+ else -> createUnknownUserAgent()
+ }
+ }
+
+ private fun parseAndroidUserAgent(userAgent: String): DeviceExtendedInfo {
+ val appName = userAgent.substringBefore("/")
+ val appVersion = userAgent.substringAfter("/").substringBefore(" (")
+ val deviceInfoSegments = userAgent.substringAfter("(").substringBeforeLast(")").split("; ")
+ val deviceModel: String?
+ val deviceOperatingSystem: String?
+ if (deviceInfoSegments.firstOrNull() == "Linux") {
+ val deviceOperatingSystemIndex = deviceInfoSegments.indexOfFirst { it.startsWith("Android") }
+ deviceOperatingSystem = deviceInfoSegments.getOrNull(deviceOperatingSystemIndex)
+ deviceModel = deviceInfoSegments.getOrNull(deviceOperatingSystemIndex + 1)
+ } else {
+ deviceModel = deviceInfoSegments.getOrNull(0)
+ deviceOperatingSystem = deviceInfoSegments.getOrNull(1)
+ }
+ return DeviceExtendedInfo(
+ deviceType = DeviceType.MOBILE,
+ deviceModel = deviceModel,
+ deviceOperatingSystem = deviceOperatingSystem,
+ clientName = appName,
+ clientVersion = appVersion
+ )
+ }
+
+ private fun parseIosUserAgent(userAgent: String): DeviceExtendedInfo {
+ val appName = userAgent.substringBefore("/")
+ val appVersion = userAgent.substringAfter("/").substringBefore(" (")
+ val deviceInfoSegments = userAgent.substringAfter("(").substringBeforeLast(")").split("; ")
+ val deviceModel = deviceInfoSegments.getOrNull(0)
+ val deviceOperatingSystem = deviceInfoSegments.getOrNull(1)
+ return DeviceExtendedInfo(
+ deviceType = DeviceType.MOBILE,
+ deviceModel = deviceModel,
+ deviceOperatingSystem = deviceOperatingSystem,
+ clientName = appName,
+ clientVersion = appVersion
+ )
+ }
+
+ private fun parseDesktopUserAgent(userAgent: String): DeviceExtendedInfo {
+ val browserSegments = userAgent.split(" ")
+ val (browserName, browserVersion) = when {
+ isFirefox(browserSegments) -> {
+ Pair("Firefox", getBrowserVersion(browserSegments, "Firefox"))
+ }
+ isEdge(browserSegments) -> {
+ Pair("Edge", getBrowserVersion(browserSegments, "Edge"))
+ }
+ isMobile(browserSegments) -> {
+ when (val name = getMobileBrowserName(browserSegments)) {
+ null -> {
+ Pair(null, null)
+ }
+ "Safari" -> {
+ Pair(name, getBrowserVersion(browserSegments, "Version"))
+ }
+ else -> {
+ Pair(name, getBrowserVersion(browserSegments, name))
+ }
+ }
+ }
+ isSafari(browserSegments) -> {
+ Pair("Safari", getBrowserVersion(browserSegments, "Version"))
+ }
+ else -> {
+ when (val name = getRegularBrowserName(browserSegments)) {
+ null -> {
+ Pair(null, null)
+ }
+ else -> {
+ Pair(name, getBrowserVersion(browserSegments, name))
+ }
+ }
+ }
+ }
+
+ val deviceOperatingSystemSegments = userAgent.substringAfter("(").substringBefore(")").split("; ")
+ val deviceOperatingSystem = if (deviceOperatingSystemSegments.getOrNull(1)?.startsWith("Android").orFalse()) {
+ deviceOperatingSystemSegments.getOrNull(1)
+ } else {
+ deviceOperatingSystemSegments.getOrNull(0)
+ }
+ return DeviceExtendedInfo(
+ deviceType = DeviceType.DESKTOP,
+ deviceModel = null,
+ deviceOperatingSystem = deviceOperatingSystem,
+ clientName = browserName,
+ clientVersion = browserVersion,
+ )
+ }
+
+ private fun parseWebUserAgent(userAgent: String): DeviceExtendedInfo {
+ return parseDesktopUserAgent(userAgent).copy(
+ deviceType = DeviceType.WEB
+ )
+ }
+
+ private fun createUnknownUserAgent(): DeviceExtendedInfo {
+ return DeviceExtendedInfo(DeviceType.UNKNOWN)
+ }
+
+ private fun isFirefox(browserSegments: List<String>): Boolean {
+ return browserSegments.lastOrNull()?.startsWith("Firefox").orFalse()
+ }
+
+ private fun getBrowserVersion(browserSegments: List<String>, browserName: String): String? {
+ // Chrome/104.0.3497.100 -> 104
+ return browserSegments
+ .find { it.startsWith(browserName) }
+ ?.split("/")
+ ?.getOrNull(1)
+ ?.split(".")
+ ?.firstOrNull()
+ }
+
+ private fun isEdge(browserSegments: List<String>): Boolean {
+ return browserSegments.lastOrNull()?.startsWith("Edge").orFalse()
+ }
+
+ private fun isSafari(browserSegments: List<String>): Boolean {
+ return browserSegments.lastOrNull()?.startsWith("Safari").orFalse() &&
+ browserSegments.getOrNull(browserSegments.size - 2)?.startsWith("Version").orFalse()
+ }
+
+ private fun isMobile(browserSegments: List<String>): Boolean {
+ return browserSegments.getOrNull(browserSegments.size - 2)?.startsWith("Mobile").orFalse()
+ }
+
+ private fun getMobileBrowserName(browserSegments: List<String>): String? {
+ val possibleBrowserName = browserSegments.getOrNull(browserSegments.size - 3)?.split("/")?.firstOrNull()
+ return if (possibleBrowserName == "Version") {
+ "Safari"
+ } else {
+ possibleBrowserName
+ }
+ }
+
+ private fun getRegularBrowserName(browserSegments: List<String>): String? {
+ return browserSegments.getOrNull(browserSegments.size - 2)?.split("/")?.firstOrNull()
+ }
+
+ companion object {
+ // Element dbg/1.5.0-dev (Xiaomi; Mi 9T; Android 11; RKQ1.200826.002 test-keys; Flavour GooglePlay; MatrixAndroidSdk2 1.5.0)
+ // Legacy : Element/1.0.0 (Linux; U; Android 6.0.1; SM-A510F Build/MMB29; Flavour GPlay; MatrixAndroidSdk2 1.0)
+ private const val ANDROID_KEYWORD = "; MatrixAndroidSdk2"
+
+ // Element/1.8.21 (iPhone XS Max; iOS 15.2; Scale/3.00)
+ private const val IOS_KEYWORD = "; iOS "
+
+ // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) ElementNightly/2022091301
+ // Chrome/104.0.5112.102 Electron/20.1.1 Safari/537.36
+ private const val DESKTOP_KEYWORD = " Electron/"
+
+ // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36
+ private const val WEB_KEYWORD = "Mozilla/"
+ }
+}
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 1e5c4d88e0..0fdbd40178 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
@@ -21,7 +21,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import com.airbnb.mvrx.Success
@@ -82,7 +81,6 @@ class VectorSettingsDevicesFragment :
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- initLearnMoreButtons()
initWaitingView()
initOtherSessionsView()
initSecurityRecommendationsView()
@@ -155,12 +153,6 @@ class VectorSettingsDevicesFragment :
super.onDestroyView()
}
- private fun initLearnMoreButtons() {
- views.deviceListHeaderOtherSessions.onLearnMoreClickListener = {
- Toast.makeText(context, "Learn more other", Toast.LENGTH_LONG).show()
- }
- }
-
private fun cleanUpLearnMoreButtonsListeners() {
views.deviceListHeaderOtherSessions.onLearnMoreClickListener = null
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
index ef8682df01..0660e7d642 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
@@ -65,14 +65,23 @@ class SessionsListHeaderView @JvmOverloads constructor(
return
}
+ val hasLearnMoreLink = typedArray.getBoolean(R.styleable.SessionsListHeaderView_sessionsListHeaderHasLearnMoreLink, true)
+ if (hasLearnMoreLink) {
+ setDescriptionWithLearnMore(description)
+ } else {
+ binding.sessionsListHeaderDescription.text = description
+ }
+
+ binding.sessionsListHeaderDescription.isVisible = true
+ }
+
+ private fun setDescriptionWithLearnMore(description: String) {
val learnMore = context.getString(R.string.action_learn_more)
val fullDescription = buildString {
append(description)
append(" ")
append(learnMore)
}
-
- binding.sessionsListHeaderDescription.isVisible = true
binding.sessionsListHeaderDescription.setTextWithColoredPart(
fullText = fullDescription,
coloredPart = learnMore,
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt
new file mode 100644
index 0000000000..22ca06eb1e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt
@@ -0,0 +1,75 @@
+/*
+ * 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.more
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.FragmentManager
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetSessionLearnMoreBinding
+import kotlinx.parcelize.Parcelize
+
+@AndroidEntryPoint
+class SessionLearnMoreBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSessionLearnMoreBinding>() {
+
+ @Parcelize
+ data class Args(
+ val title: String,
+ val description: String,
+ ) : Parcelable
+
+ private val viewModel: SessionLearnMoreViewModel by fragmentViewModel()
+
+ override val showExpanded = true
+
+ override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSessionLearnMoreBinding {
+ return BottomSheetSessionLearnMoreBinding.inflate(inflater, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initCloseButton()
+ }
+
+ private fun initCloseButton() {
+ views.bottomSheetSessionLearnMoreCloseButton.debouncedClicks {
+ dismiss()
+ }
+ }
+
+ override fun invalidate() = withState(viewModel) { viewState ->
+ super.invalidate()
+ views.bottomSheetSessionLearnMoreTitle.text = viewState.title
+ views.bottomSheetSessionLearnMoreDescription.text = viewState.description
+ }
+
+ companion object {
+
+ fun show(fragmentManager: FragmentManager, args: Args) {
+ val bottomSheet = SessionLearnMoreBottomSheet()
+ bottomSheet.isCancelable = true
+ bottomSheet.setArguments(args)
+ bottomSheet.show(fragmentManager, "SessionLearnMoreBottomSheet")
+ }
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewModel.kt
new file mode 100644
index 0000000000..09ca2df15d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewModel.kt
@@ -0,0 +1,43 @@
+/*
+ * 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.more
+
+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
+
+class SessionLearnMoreViewModel @AssistedInject constructor(
+ @Assisted initialState: SessionLearnMoreViewState,
+) : VectorViewModel<SessionLearnMoreViewState, EmptyAction, EmptyViewEvents>(initialState) {
+
+ @AssistedFactory
+ interface Factory : MavericksAssistedViewModelFactory<SessionLearnMoreViewModel, SessionLearnMoreViewState> {
+ override fun create(initialState: SessionLearnMoreViewState): SessionLearnMoreViewModel
+ }
+
+ companion object : MavericksViewModelFactory<SessionLearnMoreViewModel, SessionLearnMoreViewState> by hiltMavericksViewModelFactory()
+
+ override fun handle(action: EmptyAction) {
+ // do nothing
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewState.kt
new file mode 100644
index 0000000000..cade2ce861
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewState.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 im.vector.app.features.settings.devices.v2.more
+
+import com.airbnb.mvrx.MavericksState
+
+data class SessionLearnMoreViewState(
+ val title: String,
+ val description: String,
+) : MavericksState {
+ constructor(args: SessionLearnMoreBottomSheet.Args) : this(
+ title = args.title,
+ description = args.description,
+ )
+}
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 5734b04089..610776e22e 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
@@ -20,6 +20,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import androidx.annotation.StringRes
import androidx.core.view.isVisible
import com.airbnb.mvrx.Success
import com.airbnb.mvrx.args
@@ -37,6 +38,7 @@ import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterBott
import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
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 javax.inject.Inject
@@ -121,6 +123,7 @@ class OtherSessionsFragment :
)
)
views.otherSessionsNotFoundTextView.text = getString(R.string.device_manager_other_sessions_no_verified_sessions_found)
+ updateSecurityLearnMoreButton(R.string.device_manager_learn_more_sessions_verified_title, R.string.device_manager_learn_more_sessions_verified)
}
DeviceManagerFilterType.UNVERIFIED -> {
views.otherSessionsSecurityRecommendationView.render(
@@ -132,6 +135,10 @@ class OtherSessionsFragment :
)
)
views.otherSessionsNotFoundTextView.text = getString(R.string.device_manager_other_sessions_no_unverified_sessions_found)
+ updateSecurityLearnMoreButton(
+ R.string.device_manager_learn_more_sessions_unverified_title,
+ R.string.device_manager_learn_more_sessions_unverified
+ )
}
DeviceManagerFilterType.INACTIVE -> {
views.otherSessionsSecurityRecommendationView.render(
@@ -147,8 +154,10 @@ class OtherSessionsFragment :
)
)
views.otherSessionsNotFoundTextView.text = getString(R.string.device_manager_other_sessions_no_inactive_sessions_found)
+ updateSecurityLearnMoreButton(R.string.device_manager_learn_more_sessions_inactive_title, R.string.device_manager_learn_more_sessions_inactive)
+ }
+ DeviceManagerFilterType.ALL_SESSIONS -> { /* NOOP. View is not visible */
}
- DeviceManagerFilterType.ALL_SESSIONS -> { /* NOOP. View is not visible */ }
}
if (devices.isNullOrEmpty()) {
@@ -161,6 +170,26 @@ class OtherSessionsFragment :
}
}
+ private fun updateSecurityLearnMoreButton(
+ @StringRes titleResId: Int,
+ @StringRes descriptionResId: Int,
+ ) {
+ views.otherSessionsSecurityRecommendationView.onLearnMoreClickListener = {
+ showLearnMoreInfo(titleResId, getString(descriptionResId))
+ }
+ }
+
+ private fun showLearnMoreInfo(
+ @StringRes titleResId: Int,
+ description: String,
+ ) {
+ val args = SessionLearnMoreBottomSheet.Args(
+ title = getString(titleResId),
+ description = description,
+ )
+ SessionLearnMoreBottomSheet.show(childFragmentManager, args)
+ }
+
override fun onOtherSessionClicked(deviceId: String) {
viewNavigator.navigateToSessionOverview(
context = requireActivity(),
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCase.kt
index 121973a134..42cd49b072 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCase.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.settings.devices.v2.overview
import androidx.lifecycle.asFlow
import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.ParseDeviceUserAgentUseCase
import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase
import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
import im.vector.app.features.settings.devices.v2.verification.GetEncryptionTrustLevelForDeviceUseCase
@@ -34,6 +35,7 @@ class GetDeviceFullInfoUseCase @Inject constructor(
private val getCurrentSessionCrossSigningInfoUseCase: GetCurrentSessionCrossSigningInfoUseCase,
private val getEncryptionTrustLevelForDeviceUseCase: GetEncryptionTrustLevelForDeviceUseCase,
private val checkIfSessionIsInactiveUseCase: CheckIfSessionIsInactiveUseCase,
+ private val parseDeviceUserAgentUseCase: ParseDeviceUserAgentUseCase,
) {
fun execute(deviceId: String): Flow<DeviceFullInfo> {
@@ -49,12 +51,14 @@ class GetDeviceFullInfoUseCase @Inject constructor(
val roomEncryptionTrustLevel = getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoInfo)
val isInactive = checkIfSessionIsInactiveUseCase.execute(info.lastSeenTs ?: 0)
val isCurrentDevice = currentSessionCrossSigningInfo.deviceId == cryptoInfo.deviceId
+ val deviceUserAgent = parseDeviceUserAgentUseCase.execute(info.getBestLastSeenUserAgent())
DeviceFullInfo(
deviceInfo = info,
cryptoDeviceInfo = cryptoInfo,
roomEncryptionTrustLevel = roomEncryptionTrustLevel,
isInactive = isInactive,
isCurrentDevice = isCurrentDevice,
+ deviceExtendedInfo = deviceUserAgent,
)
} else {
null
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt
index 4af4913183..8c3b907070 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt
@@ -41,9 +41,11 @@ import im.vector.app.databinding.FragmentSessionOverviewBinding
import im.vector.app.features.auth.ReAuthActivity
import im.vector.app.features.crypto.recover.SetupMode
import im.vector.app.features.settings.devices.v2.list.SessionInfoViewState
+import im.vector.app.features.settings.devices.v2.more.SessionLearnMoreBottomSheet
import im.vector.app.features.workers.signout.SignOutUiWorker
import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
import javax.inject.Inject
/**
@@ -204,6 +206,9 @@ class SessionOverviewFragment :
isLastSeenDetailsVisible = true,
)
views.sessionOverviewInfo.render(infoViewState, dateFormatter, drawableProvider, colorProvider)
+ views.sessionOverviewInfo.onLearnMoreClickListener = {
+ showLearnMoreInfoVerificationStatus(deviceInfo.roomEncryptionTrustLevel == RoomEncryptionTrustLevel.Trusted)
+ }
} else {
views.sessionOverviewInfo.isVisible = false
}
@@ -249,4 +254,22 @@ class SessionOverviewFragment :
reAuthActivityResultLauncher.launch(intent)
}
}
+
+ private fun showLearnMoreInfoVerificationStatus(isVerified: Boolean) {
+ val titleResId = if (isVerified) {
+ R.string.device_manager_verification_status_verified
+ } else {
+ R.string.device_manager_verification_status_unverified
+ }
+ val descriptionResId = if (isVerified) {
+ R.string.device_manager_learn_more_sessions_verified
+ } else {
+ R.string.device_manager_learn_more_sessions_unverified
+ }
+ val args = SessionLearnMoreBottomSheet.Args(
+ title = getString(titleResId),
+ description = getString(descriptionResId),
+ )
+ SessionLearnMoreBottomSheet.show(childFragmentManager, args)
+ }
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
index df92bee100..2f671492e3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
@@ -24,9 +24,11 @@ import androidx.core.widget.doOnTextChanged
import com.airbnb.mvrx.fragmentViewModel
import com.airbnb.mvrx.withState
import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
import im.vector.app.core.extensions.showKeyboard
import im.vector.app.core.platform.VectorBaseFragment
import im.vector.app.databinding.FragmentSessionRenameBinding
+import im.vector.app.features.settings.devices.v2.more.SessionLearnMoreBottomSheet
import javax.inject.Inject
/**
@@ -51,6 +53,7 @@ class RenameSessionFragment :
initEditText()
initSaveButton()
initWithLastEditedName()
+ initInfoView()
}
private fun initToolbar() {
@@ -75,6 +78,20 @@ class RenameSessionFragment :
viewModel.handle(RenameSessionAction.InitWithLastEditedName)
}
+ private fun initInfoView() {
+ views.renameSessionInfo.onLearnMoreClickListener = {
+ showLearnMoreInfo()
+ }
+ }
+
+ private fun showLearnMoreInfo() {
+ val args = SessionLearnMoreBottomSheet.Args(
+ title = getString(R.string.device_manager_learn_more_session_rename_title),
+ description = getString(R.string.device_manager_learn_more_session_rename),
+ )
+ SessionLearnMoreBottomSheet.show(childFragmentManager, args)
+ }
+
private fun observeViewEvents() {
viewModel.observeViewEvents {
when (it) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
index 5061eb4036..199169484c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
@@ -72,7 +72,7 @@ class NewSpaceSummaryController @Inject constructor(
text(host.stringProvider.getString(R.string.all_chats))
selected(selected)
countState(UnreadCounterBadgeView.State.Count(homeCount.totalCount, homeCount.isHighlight))
- listener { host.callback?.onSpaceSelected(null) }
+ listener { host.callback?.onSpaceSelected(null, isSubSpace = false) }
}
}
@@ -99,7 +99,7 @@ class NewSpaceSummaryController @Inject constructor(
hasChildren(hasChildren)
matrixItem(spaceSummary.toMatrixItem())
onLongClickListener { host.callback?.onSpaceSettings(spaceSummary) }
- onSpaceSelectedListener { host.callback?.onSpaceSelected(spaceSummary) }
+ onSpaceSelectedListener { host.callback?.onSpaceSelected(spaceSummary, isSubSpace = false) }
onToggleExpandListener { host.callback?.onToggleExpand(spaceSummary) }
selected(isSelected)
}
@@ -140,7 +140,7 @@ class NewSpaceSummaryController @Inject constructor(
indent(depth)
matrixItem(childSummary.toMatrixItem())
onLongClickListener { host.callback?.onSpaceSettings(childSummary) }
- onSubSpaceSelectedListener { host.callback?.onSpaceSelected(childSummary) }
+ onSubSpaceSelectedListener { host.callback?.onSpaceSelected(childSummary, isSubSpace = true) }
onToggleExpandListener { host.callback?.onToggleExpand(childSummary) }
selected(isSelected)
}
@@ -184,8 +184,10 @@ class NewSpaceSummaryController @Inject constructor(
}
}
+ /**
+ * This is a full duplicate of [SpaceSummaryController.Callback]. We need to merge them ASAP*/
interface Callback {
- fun onSpaceSelected(spaceSummary: RoomSummary?)
+ fun onSpaceSelected(spaceSummary: RoomSummary?, isSubSpace: Boolean)
fun onSpaceInviteSelected(spaceSummary: RoomSummary)
fun onSpaceSettings(spaceSummary: RoomSummary)
fun onToggleExpand(spaceSummary: RoomSummary)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
index fd2e68e172..1ef755e684 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
@@ -20,7 +20,7 @@ import im.vector.app.core.platform.VectorViewModelAction
import org.matrix.android.sdk.api.session.room.model.RoomSummary
sealed class SpaceListAction : VectorViewModelAction {
- data class SelectSpace(val spaceSummary: RoomSummary?) : SpaceListAction()
+ data class SelectSpace(val spaceSummary: RoomSummary?, val isSubSpace: Boolean) : SpaceListAction()
data class OpenSpaceInvite(val spaceSummary: RoomSummary) : SpaceListAction()
data class LeaveSpace(val spaceSummary: RoomSummary) : SpaceListAction()
data class ToggleExpand(val spaceSummary: RoomSummary) : SpaceListAction()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListBottomSheet.kt
index 4787aed8ae..9991384643 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListBottomSheet.kt
@@ -25,6 +25,7 @@ import im.vector.app.R
import im.vector.app.core.extensions.replaceChildFragment
import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
import im.vector.app.databinding.FragmentSpacesBottomSheetBinding
+import im.vector.app.features.analytics.plan.MobileScreen
class SpaceListBottomSheet : VectorBaseBottomSheetDialogFragment<FragmentSpacesBottomSheetBinding>() {
@@ -32,6 +33,11 @@ class SpaceListBottomSheet : VectorBaseBottomSheetDialogFragment<FragmentSpacesB
return FragmentSpacesBottomSheetBinding.inflate(inflater, container, false)
}
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ analyticsScreenName = MobileScreen.ScreenName.SpaceBottomSheet
+ }
+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
if (savedInstanceState == null) {
replaceChildFragment(R.id.space_list, SpaceListFragment::class.java)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index 27a118e4dc..550db1d0d1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -176,8 +176,8 @@ class SpaceListFragment :
}
}
- override fun onSpaceSelected(spaceSummary: RoomSummary?) {
- viewModel.handle(SpaceListAction.SelectSpace(spaceSummary))
+ override fun onSpaceSelected(spaceSummary: RoomSummary?, isSubSpace: Boolean) {
+ viewModel.handle(SpaceListAction.SelectSpace(spaceSummary, isSubSpace = isSubSpace))
roomListSharedActionViewModel.post(RoomListSharedAction.CloseBottomSheet)
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
index 9786d80ae7..99f6a254b8 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
@@ -215,7 +215,18 @@ class SpaceListViewModel @AssistedInject constructor(
private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
if (state.selectedSpace?.roomId != action.spaceSummary?.roomId) {
- analyticsTracker.capture(Interaction(null, null, Interaction.Name.SpacePanelSwitchSpace))
+ val interactionName = if (action.isSubSpace) {
+ Interaction.Name.SpacePanelSwitchSubSpace
+ } else {
+ Interaction.Name.SpacePanelSwitchSpace
+ }
+ analyticsTracker.capture(
+ Interaction(
+ index = null,
+ interactionType = null,
+ name = interactionName
+ )
+ )
setState { copy(selectedSpace = action.spaceSummary) }
spaceStateHandler.setCurrentSpace(action.spaceSummary?.roomId)
_viewEvents.post(SpaceListViewEvents.CloseDrawer)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index ff8f5c38f7..acc1df5405 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -88,7 +88,7 @@ class SpaceSummaryController @Inject constructor(
id("space_home")
selected(selectedSpace == null)
countState(UnreadCounterBadgeView.State.Count(homeCount.totalCount, homeCount.isHighlight))
- listener { host.callback?.onSpaceSelected(null) }
+ listener { host.callback?.onSpaceSelected(null, isSubSpace = false) }
}
rootSpaces
@@ -114,7 +114,7 @@ class SpaceSummaryController @Inject constructor(
selected(isSelected)
canDrag(true)
onMore { host.callback?.onSpaceSettings(roomSummary) }
- listener { host.callback?.onSpaceSelected(roomSummary) }
+ listener { host.callback?.onSpaceSelected(roomSummary, isSubSpace = false) }
toggleExpand { host.callback?.onToggleExpand(roomSummary) }
countState(
UnreadCounterBadgeView.State.Count(
@@ -165,7 +165,7 @@ class SpaceSummaryController @Inject constructor(
expanded(expanded)
onMore { host.callback?.onSpaceSettings(childSummary) }
matrixItem(childSummary.toMatrixItem())
- listener { host.callback?.onSpaceSelected(childSummary) }
+ listener { host.callback?.onSpaceSelected(childSummary, isSubSpace = true) }
toggleExpand { host.callback?.onToggleExpand(childSummary) }
indent(currentDepth)
countState(
@@ -184,7 +184,7 @@ class SpaceSummaryController @Inject constructor(
}
interface Callback {
- fun onSpaceSelected(spaceSummary: RoomSummary?)
+ fun onSpaceSelected(spaceSummary: RoomSummary?, isSubSpace: Boolean)
fun onSpaceInviteSelected(spaceSummary: RoomSummary)
fun onSpaceSettings(spaceSummary: RoomSummary)
fun onToggleExpand(spaceSummary: RoomSummary)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
index 4c44bfc7a8..6c31b9e856 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
@@ -25,6 +25,7 @@ import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.core.epoxy.onClick
import im.vector.app.core.platform.VectorBaseFragment
import im.vector.app.databinding.FragmentSpaceCreateChooseTypeBinding
+import im.vector.app.features.analytics.plan.MobileScreen
@AndroidEntryPoint
class ChooseSpaceTypeFragment :
@@ -35,6 +36,11 @@ class ChooseSpaceTypeFragment :
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
FragmentSpaceCreateChooseTypeBinding.inflate(layoutInflater, container, false)
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ analyticsScreenName = MobileScreen.ScreenName.CreateSpace
+ }
+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index b680f77df2..1cfac4a5fe 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -32,6 +32,8 @@ import im.vector.app.core.error.ErrorFormatter
import im.vector.app.core.extensions.isEmail
import im.vector.app.core.platform.VectorViewModel
import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.plan.Interaction
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.MatrixPatterns
@@ -46,7 +48,8 @@ class CreateSpaceViewModel @AssistedInject constructor(
private val session: Session,
private val stringProvider: StringProvider,
private val createSpaceViewModelTask: CreateSpaceViewModelTask,
- private val errorFormatter: ErrorFormatter
+ private val errorFormatter: ErrorFormatter,
+ private val analyticsTracker: AnalyticsTracker,
) : VectorViewModel<CreateSpaceState, CreateSpaceAction, CreateSpaceEvents>(initialState) {
private val identityService = session.identityService()
@@ -350,6 +353,13 @@ class CreateSpaceViewModel @AssistedInject constructor(
}
viewModelScope.launch(Dispatchers.IO) {
try {
+ analyticsTracker.capture(
+ Interaction(
+ index = null,
+ interactionType = null,
+ name = Interaction.Name.MobileSpaceCreationValidated
+ )
+ )
val alias = if (state.spaceType == SpaceType.Public) {
state.aliasLocalPart
} else null
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
index 5e6efcc816..3b74b4b38b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
@@ -77,7 +77,7 @@ class SpacePeopleListController @Inject constructor(
id(roomMember.userId)
matrixItem(roomMember.toMatrixItem())
avatarRenderer(host.avatarRenderer)
- userEncryptionTrustLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
+ userVerificationLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
.apply {
val pl = host.toPowerLevelLabel(memberEntry.first)
if (memberEntry.first == RoomMemberListCategories.INVITE) {
diff --git a/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml b/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml
new file mode 100644
index 0000000000..3e93522b18
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M20.189,4.187C19.85,3.751 19.222,3.672 18.785,4.011C18.35,4.35 18.271,4.977 18.609,5.413L18.61,5.414L18.611,5.415L18.624,5.434C18.638,5.451 18.659,5.48 18.687,5.52C18.744,5.6 18.828,5.722 18.931,5.884C19.137,6.207 19.415,6.683 19.693,7.281C20.253,8.481 20.799,10.134 20.799,12.001C20.799,13.867 20.253,15.52 19.693,16.721C19.415,17.318 19.137,17.794 18.931,18.117C18.828,18.279 18.744,18.401 18.687,18.481C18.659,18.521 18.638,18.55 18.624,18.568L18.611,18.586L18.61,18.587L18.609,18.588C18.271,19.024 18.35,19.651 18.785,19.99C19.222,20.329 19.85,20.25 20.189,19.815L19.444,19.235C20.189,19.815 20.189,19.815 20.189,19.815L20.191,19.812L20.194,19.808L20.202,19.797L20.229,19.762C20.25,19.733 20.281,19.691 20.318,19.639C20.393,19.534 20.496,19.383 20.618,19.191C20.862,18.807 21.184,18.255 21.506,17.566C22.145,16.195 22.799,14.248 22.799,12.001C22.799,9.753 22.145,7.806 21.506,6.435C21.184,5.746 20.862,5.194 20.618,4.81C20.496,4.618 20.393,4.467 20.318,4.362C20.281,4.31 20.25,4.268 20.229,4.239L20.202,4.204L20.194,4.193L20.191,4.189L20.19,4.188C20.19,4.188 20.189,4.187 19.399,4.801L20.189,4.187Z"
+ android:fillColor="#737D8C" />
+ <path
+ android:pathData="M17.59,7.787C17.251,7.351 16.622,7.272 16.186,7.611C15.752,7.95 15.672,8.576 16.008,9.011L16.012,9.016C16.016,9.022 16.025,9.033 16.037,9.05C16.06,9.084 16.098,9.138 16.144,9.211C16.237,9.357 16.365,9.576 16.494,9.852C16.754,10.41 17,11.163 17,12.001C17,12.839 16.754,13.592 16.494,14.149C16.365,14.425 16.237,14.644 16.144,14.791C16.098,14.864 16.06,14.918 16.037,14.951C16.025,14.968 16.016,14.98 16.012,14.986L16.008,14.99C15.672,15.426 15.752,16.052 16.186,16.39C16.622,16.729 17.251,16.651 17.59,16.215L16.8,15.601C17.59,16.215 17.59,16.215 17.59,16.215L17.591,16.212L17.594,16.21L17.599,16.202L17.616,16.18C17.629,16.163 17.646,16.139 17.667,16.11C17.709,16.051 17.765,15.968 17.831,15.865C17.963,15.657 18.135,15.362 18.306,14.995C18.646,14.267 19,13.22 19,12.001C19,10.782 18.646,9.735 18.306,9.006C18.135,8.639 17.963,8.344 17.831,8.137C17.765,8.033 17.709,7.951 17.667,7.892C17.646,7.863 17.629,7.839 17.616,7.821L17.599,7.799L17.594,7.792L17.591,7.789L17.59,7.788C17.59,7.788 17.59,7.787 16.8,8.401L17.59,7.787Z"
+ android:fillColor="#737D8C" />
+ <path
+ android:pathData="M3.611,19.815C3.95,20.25 4.578,20.329 5.014,19.99C5.45,19.651 5.528,19.024 5.191,18.588L5.19,18.587L5.189,18.586L5.175,18.568C5.162,18.55 5.141,18.521 5.112,18.481C5.056,18.401 4.971,18.279 4.869,18.117C4.663,17.794 4.385,17.318 4.106,16.721C3.546,15.52 3,13.867 3,12C3,10.134 3.546,8.481 4.106,7.281C4.385,6.683 4.663,6.207 4.869,5.884C4.971,5.722 5.056,5.6 5.112,5.52C5.141,5.48 5.162,5.451 5.175,5.433L5.189,5.415L5.19,5.414L5.191,5.413C5.528,4.977 5.449,4.35 5.014,4.011C4.578,3.672 3.95,3.751 3.611,4.187L4.356,4.766C3.611,4.187 3.611,4.187 3.611,4.187L3.609,4.189L3.606,4.193L3.598,4.204L3.571,4.239C3.549,4.268 3.519,4.31 3.482,4.362C3.407,4.467 3.304,4.618 3.181,4.81C2.937,5.194 2.615,5.746 2.294,6.435C1.654,7.806 1,9.753 1,12C1,14.248 1.654,16.195 2.294,17.566C2.615,18.255 2.937,18.807 3.181,19.191C3.304,19.383 3.407,19.534 3.482,19.639C3.519,19.691 3.549,19.733 3.571,19.762L3.598,19.797L3.606,19.808L3.609,19.812L3.61,19.813C3.61,19.813 3.611,19.815 4.4,19.201L3.611,19.815Z"
+ android:fillColor="#737D8C" />
+ <path
+ android:pathData="M6.21,16.214C6.549,16.65 7.177,16.729 7.613,16.39C8.048,16.052 8.127,15.426 7.791,14.99L7.788,14.985C7.783,14.979 7.775,14.968 7.763,14.951C7.739,14.917 7.702,14.863 7.655,14.79C7.562,14.644 7.434,14.425 7.305,14.149C7.045,13.591 6.799,12.838 6.799,12C6.799,11.162 7.045,10.409 7.305,9.852C7.434,9.576 7.562,9.357 7.655,9.21C7.702,9.137 7.739,9.083 7.763,9.05C7.775,9.033 7.783,9.021 7.788,9.015L7.791,9.011C8.127,8.575 8.048,7.949 7.613,7.611C7.177,7.272 6.549,7.35 6.21,7.786L6.999,8.4C6.21,7.786 6.21,7.786 6.21,7.786L6.208,7.789L6.206,7.792L6.2,7.799L6.184,7.821C6.171,7.838 6.153,7.862 6.132,7.892C6.091,7.951 6.034,8.033 5.968,8.137C5.836,8.344 5.664,8.639 5.493,9.006C5.153,9.734 4.799,10.781 4.799,12C4.799,13.219 5.153,14.267 5.493,14.995C5.664,15.362 5.836,15.657 5.968,15.864C6.034,15.968 6.091,16.05 6.132,16.109C6.153,16.139 6.171,16.162 6.184,16.18L6.2,16.202L6.206,16.209L6.208,16.212L6.209,16.213C6.209,16.213 6.21,16.214 6.999,15.6L6.21,16.214Z"
+ android:fillColor="#737D8C" />
+ <path
+ android:pathData="M12,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+ android:fillColor="#737D8C" />
+</vector>
diff --git a/vector/src/main/res/drawable/poll_option_checked.xml b/vector/src/main/res/drawable/poll_option_checked.xml
index 28ab94a421..2324792eac 100644
--- a/vector/src/main/res/drawable/poll_option_checked.xml
+++ b/vector/src/main/res/drawable/poll_option_checked.xml
@@ -10,5 +10,9 @@
</item>
<item
android:drawable="@drawable/ic_check_on_white"
- android:gravity="center" />
-</layer-list>
\ No newline at end of file
+ android:top="2dp"
+ android:bottom="2dp"
+ android:left="2dp"
+ android:right="2dp"
+ />
+</layer-list>
diff --git a/vector/src/main/res/layout/bottom_sheet_session_learn_more.xml b/vector/src/main/res/layout/bottom_sheet_session_learn_more.xml
new file mode 100644
index 0000000000..466ab5af49
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_session_learn_more.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?colorSurface"
+ android:paddingHorizontal="24dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="16dp">
+
+ <View
+ android:id="@+id/bottomSheetSessionLearnMoreHandle"
+ android:layout_width="36dp"
+ android:layout_height="6dp"
+ android:background="@drawable/ic_bottom_sheet_handle"
+ app:layout_constraintBottom_toTopOf="@id/bottomSheetSessionLearnMoreTitle"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/bottomSheetSessionLearnMoreTitle"
+ style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ app:layout_constraintBottom_toTopOf="@id/bottomSheetSessionLearnMoreDescription"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/bottomSheetSessionLearnMoreHandle"
+ tools:text="Verified sessions" />
+
+ <TextView
+ android:id="@+id/bottomSheetSessionLearnMoreDescription"
+ style="@style/TextAppearance.Vector.Body"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ app:layout_constraintBottom_toTopOf="@id/bottomSheetSessionLearnMoreCloseButton"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/bottomSheetSessionLearnMoreTitle"
+ tools:text="Further context on verified sessions. What do those mean, and how do they differ from unverified ones." />
+
+ <Button
+ android:id="@+id/bottomSheetSessionLearnMoreCloseButton"
+ style="@style/Widget.Vector.Button.CallToAction"
+ android:layout_width="0dp"
+ android:layout_height="56dp"
+ android:layout_marginTop="24dp"
+ android:text="@string/action_got_it"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/bottomSheetSessionLearnMoreDescription" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index bed10f7606..fb0d80278a 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -119,8 +119,10 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji"
+ android:visibility="invisible"
app:tint="?vctr_content_tertiary"
- tools:ignore="MissingConstraints,MissingPrefix" />
+ tools:ignore="MissingConstraints,MissingPrefix"
+ tools:visibility="visible" />
<ImageButton
android:id="@+id/sendButton"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index 7b37fb9c60..81b978caa6 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -155,13 +155,15 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji"
+ android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@id/attachmentButton"
app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
app:layout_constraintStart_toEndOf="@id/composerEditText"
app:layout_constraintTop_toTopOf="@id/attachmentButton"
app:layout_goneMarginEnd="8dp"
app:tint="?vctr_content_quaternary"
- tools:ignore="MissingPrefix" />
+ tools:ignore="MissingPrefix"
+ tools:visibility="visible" />
<ImageButton
android:id="@+id/sendButton"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 72bdf37911..8cdb388bf9 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -166,6 +166,7 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji"
+ android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
app:layout_constraintStart_toEndOf="@id/composerEditText"
@@ -173,7 +174,8 @@
app:layout_goneMarginBottom="52dp"
app:layout_goneMarginEnd="8dp"
app:tint="?vctr_content_quaternary"
- tools:ignore="MissingPrefix" />
+ tools:ignore="MissingPrefix"
+ tools:visibility="visible" />
<ImageButton
android:id="@+id/sendButton"
diff --git a/vector/src/main/res/layout/fragment_other_sessions.xml b/vector/src/main/res/layout/fragment_other_sessions.xml
index 037f85ad28..e25b8b185f 100644
--- a/vector/src/main/res/layout/fragment_other_sessions.xml
+++ b/vector/src/main/res/layout/fragment_other_sessions.xml
@@ -53,11 +53,12 @@
android:id="@+id/deviceListHeaderOtherSessions"
android:layout_width="0dp"
android:layout_height="wrap_content"
- app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
- app:sessionsListHeaderTitle=""
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
+ app:layout_constraintTop_toBottomOf="@id/appBarLayout"
+ app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
+ app:sessionsListHeaderHasLearnMoreLink="false"
+ app:sessionsListHeaderTitle="" />
<im.vector.app.features.settings.devices.v2.othersessions.OtherSessionsSecurityRecommendationView
android:id="@+id/otherSessionsSecurityRecommendationView"
diff --git a/vector/src/main/res/layout/fragment_session_rename.xml b/vector/src/main/res/layout/fragment_session_rename.xml
index 12b8af00f0..cbca907353 100644
--- a/vector/src/main/res/layout/fragment_session_rename.xml
+++ b/vector/src/main/res/layout/fragment_session_rename.xml
@@ -60,6 +60,7 @@
app:layout_constraintTop_toBottomOf="@id/renameSessionInputLayout" />
<im.vector.app.features.settings.devices.v2.SessionWarningInfoView
+ android:id="@+id/renameSessionInfo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/layout_horizontal_margin"
@@ -68,6 +69,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/renameSessionDescription"
app:sessionsWarningInfoDescription="@string/device_manager_session_rename_warning"
- app:sessionsWarningInfoHasLearnMore="false" />
+ app:sessionsWarningInfoHasLearnMore="true" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_settings_devices.xml b/vector/src/main/res/layout/fragment_settings_devices.xml
index 8e2daa2239..951e9eba05 100644
--- a/vector/src/main/res/layout/fragment_settings_devices.xml
+++ b/vector/src/main/res/layout/fragment_settings_devices.xml
@@ -12,11 +12,12 @@
android:id="@+id/deviceListHeaderSectionSecurityRecommendations"
android:layout_width="0dp"
android:layout_height="wrap_content"
- app:sessionsListHeaderDescription="@string/device_manager_header_section_security_recommendations_description"
- app:sessionsListHeaderTitle="@string/device_manager_header_section_security_recommendations_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:sessionsListHeaderDescription="@string/device_manager_header_section_security_recommendations_description"
+ app:sessionsListHeaderHasLearnMoreLink="false"
+ app:sessionsListHeaderTitle="@string/device_manager_header_section_security_recommendations_title" />
<im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
android:id="@+id/deviceListUnverifiedSessionsRecommendation"
@@ -24,13 +25,13 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="16dp"
- app:recommendationTitle="@string/device_manager_unverified_sessions_title"
- app:recommendationDescription="@string/device_manager_unverified_sessions_description"
- app:recommendationImageResource="@drawable/ic_shield_warning_no_border"
- app:recommendationImageBackgroundTint="@color/shield_color_warning_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSectionSecurityRecommendations"/>
+ app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSectionSecurityRecommendations"
+ app:recommendationDescription="@string/device_manager_unverified_sessions_description"
+ app:recommendationImageBackgroundTint="@color/shield_color_warning_background"
+ app:recommendationImageResource="@drawable/ic_shield_warning_no_border"
+ app:recommendationTitle="@string/device_manager_unverified_sessions_title" />
<im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
android:id="@+id/deviceListInactiveSessionsRecommendation"
@@ -38,13 +39,13 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="16dp"
- app:recommendationTitle="@string/device_manager_inactive_sessions_title"
- app:recommendationDescription="@plurals/device_manager_inactive_sessions_description"
- app:recommendationImageResource="@drawable/ic_inactive_sessions"
- app:recommendationImageBackgroundTint="?vctr_system"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/deviceListUnverifiedSessionsRecommendation"/>
+ app:layout_constraintTop_toBottomOf="@id/deviceListUnverifiedSessionsRecommendation"
+ app:recommendationDescription="@plurals/device_manager_inactive_sessions_description"
+ app:recommendationImageBackgroundTint="?vctr_system"
+ app:recommendationImageResource="@drawable/ic_inactive_sessions"
+ app:recommendationTitle="@string/device_manager_inactive_sessions_title" />
<View
android:id="@+id/deviceListSecurityRecommendationsDivider"
@@ -60,11 +61,12 @@
android:id="@+id/deviceListHeaderCurrentSession"
android:layout_width="0dp"
android:layout_height="wrap_content"
- app:sessionsListHeaderDescription=""
- app:sessionsListHeaderTitle="@string/device_manager_current_session_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/deviceListSecurityRecommendationsDivider" />
+ app:layout_constraintTop_toBottomOf="@id/deviceListSecurityRecommendationsDivider"
+ app:sessionsListHeaderDescription=""
+ app:sessionsListHeaderHasLearnMoreLink="false"
+ app:sessionsListHeaderTitle="@string/device_manager_current_session_title" />
<im.vector.app.features.settings.devices.v2.list.SessionInfoView
android:id="@+id/deviceListCurrentSession"
@@ -90,11 +92,12 @@
android:id="@+id/deviceListHeaderOtherSessions"
android:layout_width="0dp"
android:layout_height="wrap_content"
- app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
- app:sessionsListHeaderTitle="@string/device_manager_sessions_other_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/deviceListDividerCurrentSession" />
+ app:layout_constraintTop_toBottomOf="@id/deviceListDividerCurrentSession"
+ app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
+ app:sessionsListHeaderHasLearnMoreLink="false"
+ app:sessionsListHeaderTitle="@string/device_manager_sessions_other_title" />
<im.vector.app.features.settings.devices.v2.list.OtherSessionsView
android:id="@+id/deviceListOtherSessions"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index a637c8f52e..67d286a917 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -7,6 +7,8 @@
android:background="?android:colorBackground"
android:foreground="?attr/selectableItemBackground"
android:minHeight="@dimen/item_form_min_height"
+ android:paddingBottom="8dp"
+ android:paddingTop="8dp"
tools:viewBindingIgnore="true">
<TextView
diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index c108dfd96e..6ce96111e9 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -63,6 +63,16 @@
android:src="@drawable/ic_attachment_file"
app:tint="?colorPrimary" />
+ <ImageButton
+ android:id="@+id/attachmentVoiceBroadcast"
+ android:layout_width="@dimen/layout_touch_size"
+ android:layout_height="@dimen/layout_touch_size"
+ android:layout_marginStart="2dp"
+ android:background="?android:attr/selectableItemBackground"
+ android:contentDescription="@string/attachment_type_voice_broadcast"
+ android:src="@drawable/ic_attachment_voice_broadcast"
+ app:tint="?colorPrimary" />
+
<ImageButton
android:id="@+id/attachmentPollButton"
android:layout_width="@dimen/layout_touch_size"
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index 1e8997e9c8..78e1ba42a8 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -141,6 +141,12 @@
android:summary="@string/settings_security_application_protection_summary"
android:title="@string/settings_security_application_protection_title" />
+ <im.vector.app.core.preference.VectorSwitchPreference
+ android:defaultValue="false"
+ android:key="SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY"
+ android:summary="@string/settings_security_incognito_keyboard_summary"
+ android:title="@string/settings_security_incognito_keyboard_title" />
+
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="false"
android:key="SETTINGS_SECURITY_USE_FLAG_SECURE"
diff --git a/vector/src/test/java/im/vector/app/features/MemberListViewModelTest.kt b/vector/src/test/java/im/vector/app/features/MemberListViewModelTest.kt
new file mode 100644
index 0000000000..5cad1fbc39
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/MemberListViewModelTest.kt
@@ -0,0 +1,282 @@
+/*
+ * 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
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.MutableLiveData
+import com.airbnb.mvrx.test.MvRxTestRule
+import im.vector.app.features.roomprofile.RoomProfileArgs
+import im.vector.app.features.roomprofile.members.RoomMemberListViewModel
+import im.vector.app.features.roomprofile.members.RoomMemberListViewState
+import im.vector.app.features.roomprofile.members.RoomMemberSummaryComparator
+import im.vector.app.test.test
+import im.vector.app.test.testCoroutineDispatchers
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CryptoCrossSigningKey
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
+import org.matrix.android.sdk.api.session.room.members.MembershipService
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.state.StateService
+import org.matrix.android.sdk.api.session.user.UserService
+import org.matrix.android.sdk.api.util.Optional
+
+class MemberListViewModelTest {
+
+ @get:Rule
+ val mvrxTestRule = MvRxTestRule()
+
+ @get:Rule
+ val instantExecutorRule = InstantTaskExecutorRule()
+
+ private val fakeRoomId = "!roomId"
+ private val args = RoomProfileArgs(fakeRoomId)
+
+ private val aliceMxid = "@alice:example.com"
+ private val bobMxid = "@bob:example.com"
+ private val marcMxid = "@marc:example.com"
+
+ private val aliceDevice1 = CryptoDeviceInfo(
+ deviceId = "ALICE_1",
+ userId = aliceMxid,
+ trustLevel = DeviceTrustLevel(true, true)
+ )
+
+ private val aliceDevice2 = CryptoDeviceInfo(
+ deviceId = "ALICE_2",
+ userId = aliceMxid,
+ trustLevel = DeviceTrustLevel(false, false)
+ )
+
+ private val bobDevice1 = CryptoDeviceInfo(
+ deviceId = "BOB_1",
+ userId = bobMxid,
+ trustLevel = DeviceTrustLevel(true, true)
+ )
+
+ private val bobDevice2 = CryptoDeviceInfo(
+ deviceId = "BOB_2",
+ userId = bobMxid,
+ trustLevel = DeviceTrustLevel(true, true)
+ )
+
+ private val markDevice = CryptoDeviceInfo(
+ deviceId = "MARK_1",
+ userId = marcMxid,
+ trustLevel = DeviceTrustLevel(false, true)
+ )
+
+ private val fakeMembershipservice: MembershipService = mockk {
+
+ val memberList = mutableListOf<RoomMemberSummary>(
+ RoomMemberSummary(Membership.JOIN, aliceMxid, displayName = "Alice"),
+ RoomMemberSummary(Membership.JOIN, bobMxid, displayName = "Bob"),
+ RoomMemberSummary(Membership.JOIN, marcMxid, displayName = "marc")
+ )
+
+ every { getRoomMembers(any()) } returns memberList
+
+ every { getRoomMembersLive(any()) } returns MutableLiveData(memberList)
+
+ every { areAllMembersLoadedLive() } returns MutableLiveData(true)
+
+ coEvery { areAllMembersLoaded() } returns true
+ }
+
+ private val fakeRoomCryptoService: RoomCryptoService = mockk {
+ every { isEncrypted() } returns true
+ }
+ private val fakeRoom: Room = mockk {
+
+ val fakeStateService: StateService = mockk {
+ every { getStateEventLive(any(), any()) } returns MutableLiveData()
+ every { getStateEventsLive(any(), any()) } returns MutableLiveData()
+ every { getStateEvent(any(), any()) } returns null
+ }
+
+ every { stateService() } returns fakeStateService
+
+ every { coroutineDispatchers } returns testCoroutineDispatchers
+
+ every { getRoomSummaryLive() } returns MutableLiveData<Optional<RoomSummary>>(Optional(fakeRoomSummary))
+
+ every { membershipService() } returns fakeMembershipservice
+
+ every { roomCryptoService() } returns fakeRoomCryptoService
+
+ every { roomSummary() } returns fakeRoomSummary
+ }
+
+ private val fakeUserService: UserService = mockk {
+ every { getIgnoredUsersLive() } returns MutableLiveData()
+ }
+
+ val fakeSession: Session = mockk {
+
+ val fakeCrossSigningService: CrossSigningService = mockk {
+ every { isUserTrusted(aliceMxid) } returns true
+ every { isUserTrusted(bobMxid) } returns true
+ every { isUserTrusted(marcMxid) } returns false
+
+ every { getUserCrossSigningKeys(aliceMxid) } returns MXCrossSigningInfo(
+ aliceMxid,
+ crossSigningKeys = listOf(
+ CryptoCrossSigningKey(
+ aliceMxid,
+ usages = listOf("master"),
+ keys = emptyMap(),
+ trustLevel = DeviceTrustLevel(true, true),
+ signatures = emptyMap()
+ ),
+ CryptoCrossSigningKey(
+ aliceMxid,
+ usages = listOf("self_signing"),
+ keys = emptyMap(),
+ trustLevel = DeviceTrustLevel(true, true),
+ signatures = emptyMap()
+ ),
+ CryptoCrossSigningKey(
+ aliceMxid,
+ usages = listOf("user_signing"),
+ keys = emptyMap(),
+ trustLevel = DeviceTrustLevel(true, true),
+ signatures = emptyMap()
+ )
+ ),
+ true
+ )
+ every { getUserCrossSigningKeys(bobMxid) } returns MXCrossSigningInfo(
+ aliceMxid,
+ crossSigningKeys = listOf(
+ CryptoCrossSigningKey(
+ bobMxid,
+ usages = listOf("master"),
+ keys = emptyMap(),
+ trustLevel = DeviceTrustLevel(true, true),
+ signatures = emptyMap()
+ ),
+ CryptoCrossSigningKey(
+ bobMxid,
+ usages = listOf("self_signing"),
+ keys = emptyMap(),
+ trustLevel = DeviceTrustLevel(true, true),
+ signatures = emptyMap()
+ ),
+ CryptoCrossSigningKey(
+ bobMxid,
+ usages = listOf("user_signing"),
+ keys = emptyMap(),
+ trustLevel = DeviceTrustLevel(true, true),
+ signatures = emptyMap()
+ )
+ ),
+ true
+ )
+ every { getUserCrossSigningKeys(marcMxid) } returns MXCrossSigningInfo(
+ aliceMxid,
+ crossSigningKeys = listOf(
+ CryptoCrossSigningKey(
+ marcMxid,
+ usages = listOf("master"),
+ keys = emptyMap(),
+ trustLevel = DeviceTrustLevel(false, false),
+ signatures = emptyMap()
+ ),
+ CryptoCrossSigningKey(
+ marcMxid,
+ usages = listOf("self_signing"),
+ keys = emptyMap(),
+ trustLevel = DeviceTrustLevel(false, false),
+ signatures = emptyMap()
+ ),
+ CryptoCrossSigningKey(
+ marcMxid,
+ usages = listOf("user_signing"),
+ keys = emptyMap(),
+ trustLevel = DeviceTrustLevel(false, false),
+ signatures = emptyMap()
+ )
+ ),
+ true
+ )
+ }
+
+ val fakeCryptoService: CryptoService = mockk {
+ every { crossSigningService() } returns fakeCrossSigningService
+
+ every {
+ getLiveCryptoDeviceInfo(listOf(aliceMxid, bobMxid, marcMxid))
+ } returns MutableLiveData(
+ listOf(
+ aliceDevice1, aliceDevice2, bobDevice1, bobDevice2, markDevice
+ )
+ )
+ }
+
+ val fakeRoomService: RoomService = mockk {
+ every { getRoom(any()) } returns fakeRoom
+ }
+ every { roomService() } returns fakeRoomService
+ every { userService() } returns fakeUserService
+ every { cryptoService() } returns fakeCryptoService
+ }
+
+ private val fakeRoomSummary = RoomSummary(
+ roomId = fakeRoomId,
+ displayName = "Fake Room",
+ topic = "A topic",
+ isEncrypted = true,
+ encryptionEventTs = 0,
+ typingUsers = emptyList(),
+ )
+
+ @Test
+ fun testBasicUserVerificationLevels() {
+ val viewModel = createViewModel()
+ viewModel
+ .test()
+ .assertLatestState {
+ val trustMap = it.trustLevelMap.invoke() ?: return@assertLatestState false
+ trustMap[aliceMxid] == UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED &&
+ trustMap[bobMxid] == UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED &&
+ trustMap[marcMxid] == UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY
+ }
+ .finish()
+ }
+
+ private fun createViewModel(): RoomMemberListViewModel {
+ return RoomMemberListViewModel(
+ RoomMemberListViewState(args),
+ RoomMemberSummaryComparator(),
+ fakeSession,
+ )
+ }
+}
diff --git a/vector/src/test/java/im/vector/app/features/analytics/impl/DefaultVectorAnalyticsTest.kt b/vector/src/test/java/im/vector/app/features/analytics/impl/DefaultVectorAnalyticsTest.kt
index 543d517db1..be53f1b908 100644
--- a/vector/src/test/java/im/vector/app/features/analytics/impl/DefaultVectorAnalyticsTest.kt
+++ b/vector/src/test/java/im/vector/app/features/analytics/impl/DefaultVectorAnalyticsTest.kt
@@ -23,6 +23,7 @@ import im.vector.app.test.fakes.FakeAnalyticsStore
import im.vector.app.test.fakes.FakeLateInitUserPropertiesFactory
import im.vector.app.test.fakes.FakePostHog
import im.vector.app.test.fakes.FakePostHogFactory
+import im.vector.app.test.fakes.FakeSentryFactory
import im.vector.app.test.fixtures.AnalyticsConfigFixture.anAnalyticsConfig
import im.vector.app.test.fixtures.aUserProperties
import im.vector.app.test.fixtures.aVectorAnalyticsEvent
@@ -45,9 +46,11 @@ class DefaultVectorAnalyticsTest {
private val fakePostHog = FakePostHog()
private val fakeAnalyticsStore = FakeAnalyticsStore()
private val fakeLateInitUserPropertiesFactory = FakeLateInitUserPropertiesFactory()
+ private val fakeSentryFactory = FakeSentryFactory()
private val defaultVectorAnalytics = DefaultVectorAnalytics(
postHogFactory = FakePostHogFactory(fakePostHog.instance).instance,
+ sentryFactory = fakeSentryFactory.instance,
analyticsStore = fakeAnalyticsStore.instance,
globalScope = CoroutineScope(Dispatchers.Unconfined),
analyticsConfig = anAnalyticsConfig(isEnabled = true),
@@ -67,17 +70,21 @@ class DefaultVectorAnalyticsTest {
}
@Test
- fun `when consenting to analytics then updates posthog opt out to false`() = runTest {
+ fun `when consenting to analytics then updates posthog opt out to false and initialize Sentry`() = runTest {
fakeAnalyticsStore.givenUserContent(consent = true)
fakePostHog.verifyOptOutStatus(optedOut = false)
+
+ fakeSentryFactory.verifySentryInit()
}
@Test
- fun `when revoking consent to analytics then updates posthog opt out to true`() = runTest {
+ fun `when revoking consent to analytics then updates posthog opt out to true and closes Sentry`() = runTest {
fakeAnalyticsStore.givenUserContent(consent = false)
fakePostHog.verifyOptOutStatus(optedOut = true)
+
+ fakeSentryFactory.verifySentryClose()
}
@Test
@@ -97,12 +104,14 @@ class DefaultVectorAnalyticsTest {
}
@Test
- fun `when signing out then resets posthog`() = runTest {
+ fun `when signing out then resets posthog and closes Sentry`() = runTest {
fakeAnalyticsStore.allowSettingAnalyticsIdToCallBackingFlow()
defaultVectorAnalytics.onSignOut()
fakePostHog.verifyReset()
+
+ fakeSentryFactory.verifySentryClose()
}
@Test
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt
index c8cfdc6d8a..abf3c0ade1 100644
--- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.settings.devices.v2
import android.os.SystemClock
import com.airbnb.mvrx.Success
import com.airbnb.mvrx.test.MvRxTestRule
+import im.vector.app.features.settings.devices.v2.list.DeviceType
import im.vector.app.features.settings.devices.v2.verification.CheckIfCurrentSessionCanBeVerifiedUseCase
import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
@@ -243,14 +244,16 @@ class DevicesViewModelTest {
cryptoDeviceInfo = verifiedCryptoDeviceInfo,
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
isInactive = false,
- isCurrentDevice = true
+ isCurrentDevice = true,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
val deviceFullInfo2 = DeviceFullInfo(
deviceInfo = mockk(),
cryptoDeviceInfo = unverifiedCryptoDeviceInfo,
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
isInactive = true,
- isCurrentDevice = false
+ isCurrentDevice = false,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
val deviceFullInfoList = listOf(deviceFullInfo1, deviceFullInfo2)
val deviceFullInfoListFlow = flowOf(deviceFullInfoList)
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt
index 767819fd24..efeb7f91b8 100644
--- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.settings.devices.v2
import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
import im.vector.app.features.settings.devices.v2.filter.FilterDevicesUseCase
import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase
+import im.vector.app.features.settings.devices.v2.list.DeviceType
import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
import im.vector.app.features.settings.devices.v2.verification.GetEncryptionTrustLevelForDeviceUseCase
@@ -53,6 +54,7 @@ class GetDeviceFullInfoListUseCaseTest {
private val getEncryptionTrustLevelForDeviceUseCase = mockk<GetEncryptionTrustLevelForDeviceUseCase>()
private val getCurrentSessionCrossSigningInfoUseCase = mockk<GetCurrentSessionCrossSigningInfoUseCase>()
private val filterDevicesUseCase = mockk<FilterDevicesUseCase>()
+ private val parseDeviceUserAgentUseCase = mockk<ParseDeviceUserAgentUseCase>()
private val getDeviceFullInfoListUseCase = GetDeviceFullInfoListUseCase(
activeSessionHolder = fakeActiveSessionHolder.instance,
@@ -60,6 +62,7 @@ class GetDeviceFullInfoListUseCaseTest {
getEncryptionTrustLevelForDeviceUseCase = getEncryptionTrustLevelForDeviceUseCase,
getCurrentSessionCrossSigningInfoUseCase = getCurrentSessionCrossSigningInfoUseCase,
filterDevicesUseCase = filterDevicesUseCase,
+ parseDeviceUserAgentUseCase = parseDeviceUserAgentUseCase,
)
@Before
@@ -87,21 +90,21 @@ class GetDeviceFullInfoListUseCaseTest {
lastSeenTs = A_TIMESTAMP_1,
isInactive = true,
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
- cryptoDeviceInfo = cryptoDeviceInfo1
+ cryptoDeviceInfo = cryptoDeviceInfo1,
)
val deviceInfo2 = givenADevicesInfo(
deviceId = A_DEVICE_ID_2,
lastSeenTs = A_TIMESTAMP_2,
isInactive = false,
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
- cryptoDeviceInfo = cryptoDeviceInfo2
+ cryptoDeviceInfo = cryptoDeviceInfo2,
)
val deviceInfo3 = givenADevicesInfo(
deviceId = A_DEVICE_ID_3,
lastSeenTs = A_TIMESTAMP_3,
isInactive = false,
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
- cryptoDeviceInfo = cryptoDeviceInfo3
+ cryptoDeviceInfo = cryptoDeviceInfo3,
)
val deviceInfoList = listOf(deviceInfo1, deviceInfo2, deviceInfo3)
every { fakeFlowSession.liveMyDevicesInfo() } returns flowOf(deviceInfoList)
@@ -110,21 +113,24 @@ class GetDeviceFullInfoListUseCaseTest {
cryptoDeviceInfo = cryptoDeviceInfo1,
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
isInactive = true,
- isCurrentDevice = true
+ isCurrentDevice = true,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
val expectedResult2 = DeviceFullInfo(
deviceInfo = deviceInfo2,
cryptoDeviceInfo = cryptoDeviceInfo2,
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
isInactive = false,
- isCurrentDevice = false
+ isCurrentDevice = false,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
val expectedResult3 = DeviceFullInfo(
deviceInfo = deviceInfo3,
cryptoDeviceInfo = cryptoDeviceInfo3,
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
isInactive = false,
- isCurrentDevice = false
+ isCurrentDevice = false,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
val expectedResult = listOf(expectedResult3, expectedResult2, expectedResult1)
every { filterDevicesUseCase.execute(any(), any()) } returns expectedResult
@@ -186,8 +192,12 @@ class GetDeviceFullInfoListUseCaseTest {
val deviceInfo = mockk<DeviceInfo>()
every { deviceInfo.deviceId } returns deviceId
every { deviceInfo.lastSeenTs } returns lastSeenTs
+ every { deviceInfo.getBestLastSeenUserAgent() } returns ""
every { getEncryptionTrustLevelForDeviceUseCase.execute(any(), cryptoDeviceInfo) } returns roomEncryptionTrustLevel
every { checkIfSessionIsInactiveUseCase.execute(lastSeenTs) } returns isInactive
+ every { parseDeviceUserAgentUseCase.execute(any()) } returns DeviceExtendedInfo(
+ DeviceType.MOBILE,
+ )
return deviceInfo
}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCaseTest.kt
new file mode 100644
index 0000000000..22a5a7614f
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCaseTest.kt
@@ -0,0 +1,138 @@
+/*
+ * 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
+
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+private val A_USER_AGENT_LIST_FOR_ANDROID = listOf(
+ // New User Agent Implementation
+ "Element dbg/1.5.0-dev (Xiaomi Mi 9T; Android 11; RKQ1.200826.002 test-keys; Flavour GooglePlay; MatrixAndroidSdk2 1.5.2)",
+ "Element/1.5.0 (Samsung SM-G960F; Android 6.0.1; RKQ1.200826.002; Flavour FDroid; MatrixAndroidSdk2 1.5.2)",
+ "Element/1.5.0 (Google Nexus 5; Android 7.0; RKQ1.200826.002 test test; Flavour FDroid; MatrixAndroidSdk2 1.5.2)",
+ "Element/1.5.0 (Google (Nexus) 5; Android 7.0; RKQ1.200826.002 test test; Flavour FDroid; MatrixAndroidSdk2 1.5.2)",
+ "Element/1.5.0 (Google (Nexus) (5); Android 7.0; RKQ1.200826.002 test test; Flavour FDroid; MatrixAndroidSdk2 1.5.2)",
+ // Legacy User Agent Implementation
+ "Element/1.0.0 (Linux; U; Android 6.0.1; SM-A510F Build/MMB29; Flavour GPlay; MatrixAndroidSdk2 1.0)",
+ "Element/1.0.0 (Linux; Android 7.0; SM-G610M Build/NRD90M; Flavour GPlay; MatrixAndroidSdk2 1.0)",
+)
+private val AN_EXPECTED_RESULT_LIST_FOR_ANDROID = listOf(
+ DeviceExtendedInfo(DeviceType.MOBILE, "Xiaomi Mi 9T", "Android 11", "Element dbg", "1.5.0-dev"),
+ DeviceExtendedInfo(DeviceType.MOBILE, "Samsung SM-G960F", "Android 6.0.1", "Element", "1.5.0"),
+ DeviceExtendedInfo(DeviceType.MOBILE, "Google Nexus 5", "Android 7.0", "Element", "1.5.0"),
+ DeviceExtendedInfo(DeviceType.MOBILE, "Google (Nexus) 5", "Android 7.0", "Element", "1.5.0"),
+ DeviceExtendedInfo(DeviceType.MOBILE, "Google (Nexus) (5)", "Android 7.0", "Element", "1.5.0"),
+ DeviceExtendedInfo(DeviceType.MOBILE, "SM-A510F Build/MMB29", "Android 6.0.1", "Element", "1.0.0"),
+ DeviceExtendedInfo(DeviceType.MOBILE, "SM-G610M Build/NRD90M", "Android 7.0", "Element", "1.0.0"),
+)
+
+private val A_USER_AGENT_LIST_FOR_IOS = listOf(
+ "Element/1.8.21 (iPhone; iOS 15.2; Scale/3.00)",
+ "Element/1.8.21 (iPhone XS Max; iOS 15.2; Scale/3.00)",
+ "Element/1.8.21 (iPad Pro (11-inch); iOS 15.2; Scale/3.00)",
+ "Element/1.8.21 (iPad Pro (12.9-inch) (3rd generation); iOS 15.2; Scale/3.00)",
+)
+private val AN_EXPECTED_RESULT_LIST_FOR_IOS = listOf(
+ DeviceExtendedInfo(DeviceType.MOBILE, "iPhone", "iOS 15.2", "Element", "1.8.21"),
+ DeviceExtendedInfo(DeviceType.MOBILE, "iPhone XS Max", "iOS 15.2", "Element", "1.8.21"),
+ DeviceExtendedInfo(DeviceType.MOBILE, "iPad Pro (11-inch)", "iOS 15.2", "Element", "1.8.21"),
+ DeviceExtendedInfo(DeviceType.MOBILE, "iPad Pro (12.9-inch) (3rd generation)", "iOS 15.2",
+ "Element", "1.8.21"),
+)
+
+private val A_USER_AGENT_LIST_FOR_DESKTOP = listOf(
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) ElementNightly/2022091301 Chrome/104.0.5112.102" +
+ " Electron/20.1.1 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) ElementNightly/2022091301 Chrome/104.0.5112.102 Electron/20.1.1 Safari/537.36",
+)
+private val AN_EXPECTED_RESULT_LIST_FOR_DESKTOP = listOf(
+ DeviceExtendedInfo(DeviceType.DESKTOP, null, "Macintosh", "Electron", "20"),
+ DeviceExtendedInfo(DeviceType.DESKTOP, null, "Windows NT 10.0", "Electron", "20"),
+)
+
+private val A_USER_AGENT_LIST_FOR_WEB = listOf(
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:39.0) Gecko/20100101 Firefox/39.0",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_2) AppleWebKit/600.3.18 (KHTML, like Gecko) Version/8.0.3 Safari/600.3.18",
+ "Mozilla/5.0 (Linux; Android 9; SM-G973U Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36",
+ "Mozilla/5.0 (iPad; CPU OS 8_4_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12H321 Safari/600.1.4",
+ "Mozilla/5.0 (iPhone; CPU iPhone OS 8_4_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12H321 Safari/600.1.4",
+ "Mozilla/5.0 (Windows NT 6.0; rv:40.0) Gecko/20100101 Firefox/40.0",
+ "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246",
+ )
+private val AN_EXPECTED_RESULT_LIST_FOR_WEB = listOf(
+ DeviceExtendedInfo(DeviceType.WEB, null, "Macintosh", "Chrome", "104"),
+ DeviceExtendedInfo(DeviceType.WEB, null, "Windows NT 10.0", "Chrome", "104"),
+ DeviceExtendedInfo(DeviceType.WEB, null, "Macintosh", "Firefox", "39"),
+ DeviceExtendedInfo(DeviceType.WEB, null, "Macintosh", "Safari", "8"),
+ DeviceExtendedInfo(DeviceType.WEB, null, "Android 9", "Chrome", "69"),
+ DeviceExtendedInfo(DeviceType.WEB, null, "iPad", "Safari", "8"),
+ DeviceExtendedInfo(DeviceType.WEB, null, "iPhone", "Safari", "8"),
+ DeviceExtendedInfo(DeviceType.WEB, null, "Windows NT 6.0", "Firefox", "40"),
+ DeviceExtendedInfo(DeviceType.WEB, null, "Windows NT 10.0", "Edge", "12"),
+)
+
+private val AN_UNKNOWN_USER_AGENT_LIST = listOf(
+ "AppleTV11,1/11.1",
+ "Curl Client/1.0",
+)
+private val AN_UNKNOWN_USER_AGENT_EXPECTED_RESULT_LIST = listOf(
+ DeviceExtendedInfo(DeviceType.UNKNOWN, null, null, null, null),
+ DeviceExtendedInfo(DeviceType.UNKNOWN, null, null, null, null),
+)
+
+class ParseDeviceUserAgentUseCaseTest {
+
+ private val parseDeviceUserAgentUseCase = ParseDeviceUserAgentUseCase()
+
+ @Test
+ fun `given an Android user agent then it should be parsed as expected`() {
+ A_USER_AGENT_LIST_FOR_ANDROID.forEachIndexed { index, userAgent ->
+ parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_EXPECTED_RESULT_LIST_FOR_ANDROID[index]
+ }
+ }
+
+ @Test
+ fun `given an iOS user agent then it should be parsed as expected`() {
+ A_USER_AGENT_LIST_FOR_IOS.forEachIndexed { index, userAgent ->
+ parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_EXPECTED_RESULT_LIST_FOR_IOS[index]
+ }
+ }
+
+ @Test
+ fun `given a Desktop user agent then it should be parsed as expected`() {
+ A_USER_AGENT_LIST_FOR_DESKTOP.forEachIndexed { index, userAgent ->
+ parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_EXPECTED_RESULT_LIST_FOR_DESKTOP[index]
+ }
+ }
+
+ @Test
+ fun `given a Web user agent then it should be parsed as expected`() {
+ A_USER_AGENT_LIST_FOR_WEB.forEachIndexed { index, userAgent ->
+ parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_EXPECTED_RESULT_LIST_FOR_WEB[index]
+ }
+ }
+
+ @Test
+ fun `given an unknown user agent then it should be parsed as expected`() {
+ AN_UNKNOWN_USER_AGENT_LIST.forEachIndexed { index, userAgent ->
+ parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_UNKNOWN_USER_AGENT_EXPECTED_RESULT_LIST[index]
+ }
+ }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCaseTest.kt
index 2bb5168190..3448c7324d 100644
--- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCaseTest.kt
@@ -16,7 +16,9 @@
package im.vector.app.features.settings.devices.v2.filter
+import im.vector.app.features.settings.devices.v2.DeviceExtendedInfo
import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.list.DeviceType
import org.amshove.kluent.shouldBeEqualTo
import org.amshove.kluent.shouldContainAll
import org.junit.Test
@@ -34,7 +36,8 @@ private val activeVerifiedDevice = DeviceFullInfo(
),
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
isInactive = false,
- isCurrentDevice = true
+ isCurrentDevice = true,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
private val inactiveVerifiedDevice = DeviceFullInfo(
deviceInfo = DeviceInfo(deviceId = "INACTIVE_VERIFIED_DEVICE"),
@@ -45,7 +48,8 @@ private val inactiveVerifiedDevice = DeviceFullInfo(
),
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
isInactive = true,
- isCurrentDevice = false
+ isCurrentDevice = false,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
private val activeUnverifiedDevice = DeviceFullInfo(
deviceInfo = DeviceInfo(deviceId = "ACTIVE_UNVERIFIED_DEVICE"),
@@ -56,7 +60,8 @@ private val activeUnverifiedDevice = DeviceFullInfo(
),
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
isInactive = false,
- isCurrentDevice = false
+ isCurrentDevice = false,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
private val inactiveUnverifiedDevice = DeviceFullInfo(
deviceInfo = DeviceInfo(deviceId = "INACTIVE_UNVERIFIED_DEVICE"),
@@ -67,7 +72,8 @@ private val inactiveUnverifiedDevice = DeviceFullInfo(
),
roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
isInactive = true,
- isCurrentDevice = false
+ isCurrentDevice = false,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
private val devices = listOf(
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCaseTest.kt
index 04cd5fc492..a77f8e81fd 100644
--- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCaseTest.kt
@@ -18,8 +18,11 @@ package im.vector.app.features.settings.devices.v2.overview
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.asFlow
+import im.vector.app.features.settings.devices.v2.DeviceExtendedInfo
import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.ParseDeviceUserAgentUseCase
import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase
+import im.vector.app.features.settings.devices.v2.list.DeviceType
import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
import im.vector.app.features.settings.devices.v2.verification.GetEncryptionTrustLevelForDeviceUseCase
@@ -53,12 +56,14 @@ class GetDeviceFullInfoUseCaseTest {
private val getEncryptionTrustLevelForDeviceUseCase = mockk<GetEncryptionTrustLevelForDeviceUseCase>()
private val checkIfSessionIsInactiveUseCase = mockk<CheckIfSessionIsInactiveUseCase>()
private val fakeFlowLiveDataConversions = FakeFlowLiveDataConversions()
+ private val parseDeviceUserAgentUseCase = mockk<ParseDeviceUserAgentUseCase>()
private val getDeviceFullInfoUseCase = GetDeviceFullInfoUseCase(
activeSessionHolder = fakeActiveSessionHolder.instance,
getCurrentSessionCrossSigningInfoUseCase = getCurrentSessionCrossSigningInfoUseCase,
getEncryptionTrustLevelForDeviceUseCase = getEncryptionTrustLevelForDeviceUseCase,
checkIfSessionIsInactiveUseCase = checkIfSessionIsInactiveUseCase,
+ parseDeviceUserAgentUseCase = parseDeviceUserAgentUseCase,
)
@Before
@@ -76,7 +81,7 @@ class GetDeviceFullInfoUseCaseTest {
// Given
val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo()
val deviceInfo = DeviceInfo(
- lastSeenTs = A_TIMESTAMP
+ lastSeenTs = A_TIMESTAMP,
)
fakeActiveSessionHolder.fakeSession.fakeCryptoService.myDevicesInfoWithIdLiveData = MutableLiveData(Optional(deviceInfo))
fakeActiveSessionHolder.fakeSession.fakeCryptoService.myDevicesInfoWithIdLiveData.givenAsFlow()
@@ -87,6 +92,7 @@ class GetDeviceFullInfoUseCaseTest {
val isInactive = false
val isCurrentDevice = true
every { checkIfSessionIsInactiveUseCase.execute(any()) } returns isInactive
+ every { parseDeviceUserAgentUseCase.execute(any()) } returns DeviceExtendedInfo(DeviceType.MOBILE)
// When
val deviceFullInfo = getDeviceFullInfoUseCase.execute(A_DEVICE_ID).firstOrNull()
@@ -97,7 +103,8 @@ class GetDeviceFullInfoUseCaseTest {
cryptoDeviceInfo = cryptoDeviceInfo,
roomEncryptionTrustLevel = trustLevel,
isInactive = isInactive,
- isCurrentDevice = isCurrentDevice
+ isCurrentDevice = isCurrentDevice,
+ deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE)
)
verify { fakeActiveSessionHolder.instance.getSafeActiveSession() }
verify { getCurrentSessionCrossSigningInfoUseCase.execute() }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsTracker.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsTracker.kt
index 1a490a7287..d35f1bd08c 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsTracker.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsTracker.kt
@@ -19,4 +19,4 @@ package im.vector.app.test.fakes
import im.vector.app.features.analytics.AnalyticsTracker
import io.mockk.mockk
-class FakeAnalyticsTracker : AnalyticsTracker by mockk()
+class FakeAnalyticsTracker : AnalyticsTracker by mockk(relaxUnitFun = true)
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSentryFactory.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSentryFactory.kt
new file mode 100644
index 0000000000..2628f80435
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSentryFactory.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.test.fakes
+
+import im.vector.app.features.analytics.impl.SentryFactory
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+
+class FakeSentryFactory {
+ private var isSentryEnabled = false
+
+ val instance = mockk<SentryFactory>().also {
+ every { it.initSentry() } answers {
+ isSentryEnabled = true
+ }
+
+ every { it.stopSentry() } answers {
+ isSentryEnabled = false
+ }
+ }
+
+ fun verifySentryInit() {
+ verify { instance.initSentry() }
+ }
+
+ fun verifySentryClose() {
+ verify { instance.stopSentry() }
+ }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt
index ea1769ecb2..a53043774d 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt
@@ -23,6 +23,8 @@ object AnalyticsConfigFixture {
isEnabled: Boolean = false,
postHogHost: String = "http://posthog.url",
postHogApiKey: String = "api-key",
- policyLink: String = "http://policy.link"
- ) = AnalyticsConfig(isEnabled, postHogHost, postHogApiKey, policyLink)
+ policyLink: String = "http://policy.link",
+ sentryDSN: String = "http://sentry.dsn",
+ sentryEnvironment: String = "sentry-env"
+ ) = AnalyticsConfig(isEnabled, postHogHost, postHogApiKey, policyLink, sentryDSN, sentryEnvironment)
}