Merge branch 'release/1.6.6' into main

element-hq · Oct 5, 2023 · 4fa634a · 4fa634a
2 parents fd6a45a + 7001f21
commit 4fa634a
Show file tree

Hide file tree

Showing 100 changed files with 1,635 additions and 165 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
   CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -7,7 +7,7 @@ on:
     - cron: "0 4 * * *"
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
   CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:

diff --git a/.github/workflows/nightly_er.yml b/.github/workflows/nightly_er.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 4 * * *"
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
   CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:

diff --git a/.github/workflows/sync-from-external-sources.yml b/.github/workflows/sync-from-external-sources.yml
@@ -1,5 +1,6 @@
 name: Sync Data From External Sources
 on:
+  workflow_dispatch:
   schedule:
     # At 00:00 on every Monday UTC
     - cron: '0 0 * * 1'
@@ -80,4 +81,4 @@ jobs:
 
             *Note*: Change are coming from [this project](https://github.com/matrix-org/matrix-analytics-events)
           branch: sync-analytics-plan
-          base: develop
+          base: develop
diff --git a/.github/workflows/tests-rust.yml b/.github/workflows/tests-rust.yml
@@ -9,7 +9,7 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx3g" -Dkotlin.incremental=false
   CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon
 
 jobs:

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,21 @@
+Changes in Element v1.6.6 (2023-10-05)
+======================================
+
+Bugfixes 🐛
+----------
+ - Fixed JWT token for Jitsi openidtoken-jwt authentication ([#7758](https://github.com/vector-im/element-android/issues/7758))
+ - Fix crash when max shortcuts count is exceeded ([#8644](https://github.com/vector-im/element-android/issues/8644))
+ - Fix Login with QR code not working with rust crypto. ([#8653](https://github.com/vector-im/element-android/issues/8653))
+
+Other changes
+-------------
+ - Use 3PID capability to show / hide email UI in settings ([#8615](https://github.com/vector-im/element-android/issues/8615))
+ - If an external account manager is configured on the server, use it to delete other sessions and hide the multi session deletion. ([#8616](https://github.com/vector-im/element-android/issues/8616))
+ - Hide account deactivation UI for account managed externally. ([#8619](https://github.com/vector-im/element-android/issues/8619))
+ - Fix import of SAS Emoji string translations. ([#8623](https://github.com/vector-im/element-android/issues/8623))
+ - Open external account manager for delete other sessions using Chrome custom tabs. ([#8645](https://github.com/vector-im/element-android/issues/8645))
+
+
 Changes in Element v1.6.5 (2023-07-25)
 ======================================
 

diff --git a/build.gradle b/build.gradle
@@ -331,6 +331,10 @@ ext.initScreenshotTests = { project ->
     }
 }
 
+tasks.withType(Test) {
+    maxHeapSize = "2g"
+}
+
 // Workaround to have KSP generated Kotlin code available in the IDE (for code completion)
 // Ref: https://github.com/airbnb/epoxy/releases/tag/5.0.0beta02
 subprojects { project ->

diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40106030.txt b/fastlane/metadata/android/cs-CZ/changelogs/40106030.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Element Android nyní používá Crypto Rust SDK.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40106050.txt b/fastlane/metadata/android/cs-CZ/changelogs/40106050.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: opravné vydání.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40106030.txt b/fastlane/metadata/android/de-DE/changelogs/40106030.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Element Android nutzt nun das Crypto-Rust-SDK.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40106050.txt b/fastlane/metadata/android/de-DE/changelogs/40106050.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Fehlerbehebungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40106060.txt b/fastlane/metadata/android/en-US/changelogs/40106060.txt
@@ -0,0 +1,2 @@
+Main changes in this version: mainly bug fixes.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40106030.txt b/fastlane/metadata/android/fa/changelogs/40106030.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: المنت اندروید اکنون از SDK راست Crypto استفاده می‌کند.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40106050.txt b/fastlane/metadata/android/fa/changelogs/40106050.txt
@@ -0,0 +1,2 @@
+تغغیرات عمده در این نگارش: ارائه تصحیحی.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40106030.txt b/fastlane/metadata/android/id/changelogs/40106030.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Element Android sekarang menggunakan SDK Kripto Rust.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40106050.txt b/fastlane/metadata/android/id/changelogs/40106050.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: rilis perbaikan.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105160.txt b/fastlane/metadata/android/pt-BR/changelogs/40105160.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Threads são agora habilitadas por padrão.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105180.txt b/fastlane/metadata/android/pt-BR/changelogs/40105180.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Threads são agora habilitadas por padrão.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105200.txt b/fastlane/metadata/android/pt-BR/changelogs/40105200.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Basicamente correção de bugs!
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105220.txt b/fastlane/metadata/android/pt-BR/changelogs/40105220.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Basicamente melhorias no recurso de transmissão de voz.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105240.txt b/fastlane/metadata/android/pt-BR/changelogs/40105240.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Basicamente correção de bugs, em especial a correção da mensagem não aparecer na linha do tempo.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105250.txt b/fastlane/metadata/android/pt-BR/changelogs/40105250.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Basicamente correção de bugs, em especial a correção da mensagem não aparecer na linha do tempo.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105260.txt b/fastlane/metadata/android/pt-BR/changelogs/40105260.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Basicamente correção de bugs.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105280.txt b/fastlane/metadata/android/pt-BR/changelogs/40105280.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Basicamente correção de bugs.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105300.txt b/fastlane/metadata/android/pt-BR/changelogs/40105300.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: permalinks para salas, espaços, usuários e mensagens são agora exibidos como pílulas na linha do tempo. Também corrigimos alguns problemas com figurinhas personalizadas e o marcador de lido ficando travado no passado.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105320.txt b/fastlane/metadata/android/pt-BR/changelogs/40105320.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Basicamente correção de bugs.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40106000.txt b/fastlane/metadata/android/pt-BR/changelogs/40106000.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Element Android está agora usando o Crypto Rust SDK.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40106010.txt b/fastlane/metadata/android/pt-BR/changelogs/40106010.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Element Android está agora usando o Crypto Rust SDK.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40106020.txt b/fastlane/metadata/android/pt-BR/changelogs/40106020.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Element Android está agora usando o Crypto Rust SDK.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40106030.txt b/fastlane/metadata/android/sk/changelogs/40106030.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Element Android teraz používa Crypto Rust SDK.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40106050.txt b/fastlane/metadata/android/sk/changelogs/40106050.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: opravné vydanie.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40106030.txt b/fastlane/metadata/android/sq/changelogs/40106030.txt
@@ -0,0 +1,2 @@
+Ndryshime në këtë version: Element Android tanimë përdor Crypto Rust SDK.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40106050.txt b/fastlane/metadata/android/sq/changelogs/40106050.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: hedhje në qarkullim me ndreqje të ndryshme.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40106030.txt b/fastlane/metadata/android/uk/changelogs/40106030.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Element для Android відтепер використовує Crypto Rust SDK.
+Список усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40106050.txt b/fastlane/metadata/android/uk/changelogs/40106050.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: коригувальний випуск.
+Список усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40106030.txt b/fastlane/metadata/android/zh-TW/changelogs/40106030.txt
@@ -0,0 +1,2 @@
+此版本的主要變更：現在起，Element Android 使用 Crypto Rust SDK。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40106050.txt b/fastlane/metadata/android/zh-TW/changelogs/40106050.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：版本修正。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/library/ui-strings/src/main/res/values-az/strings.xml b/library/ui-strings/src/main/res/values-az/strings.xml
@@ -256,4 +256,39 @@
     </plurals>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• IP literallarına uyğunlaşan serverlər qadağan edildi.</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">• IP literallarına uyğunlaşan serverlərə icazə verilir.</string>
+    <string name="pill_message_in_unknown_room">Otaqdakı mesaj</string>
+    <string name="set_link_link">Bağlantı</string>
+    <string name="set_link_create">Bağlantı yarat</string>
+    <string name="message_reply_to_poll_preview">Anket</string>
+    <string name="pill_message_unknown_room_or_space">Otaq / Məkan</string>
+    <string name="set_link_edit">Bağlantını redaktə et</string>
+    <string name="set_link_text">Mətn</string>
+    <string name="message_reply_to_sender_ended_poll">Anket başa çatıb.</string>
+    <string name="notice_display_name_changed_to">%1$s ekran adını %2$s olaraq dəyişdi</string>
+    <string name="rich_text_editor_inline_code">Daxili kod formatın işlət</string>
+    <string name="rich_text_editor_code_block">Kod blokun dəyiş</string>
+    <string name="notice_room_canonical_alias_set_by_you">Bu otaq üçün əsas ünvanı %1$s olaraq təyin etdiniz.</string>
+    <string name="pill_message_in_room">Mesaj %s</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Bu otaq üçün ünvan kimi %2$s-nı sildiniz və %1$s əlavə etdiniz.</string>
+    <string name="settings_access_token">Giriş Nişanəniz</string>
+    <string name="notice_room_canonical_alias_unset">%1$s bu otaq üçün əsas ünvanı sildi.</string>
+    <string name="message_reply_to_ended_poll_preview">Anket bitdi</string>
+    <string name="notice_room_canonical_alias_set">%1$s bu otaq üçün əsas ünvanı %2$s olaraq təyin etdi.</string>
+    <string name="pill_message_from_unknown_user">Mesaj</string>
+    <string name="pill_message_from_user">%s-dan² mesaj</string>
+    <string name="settings_access_token_summary">Giriş nişanəniz hesabınıza tam giriş imkanı verir.Bunu heç kimlə paylaşmayın.</string>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Bu otaq üçün alternativ %1$s ünvanın əlavə etdiniz.</item>
+        <item quantity="other">Bu otaq üçün alternativ %1$s ünvanın əlavə etdiniz.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s bu otaq üçün alternativ ünvanları dəyişdi.</string>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s bu otaq üçün %2$s alternativ ünvanın əlavə etdi.</item>
+        <item quantity="other">%1$s bu otaq üçün %2$s alternativ ünvanın əlavə etdi.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Bu otaq üçün alternativ ünvanları dəyişdiniz.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s bu otaq üçün %2$s alternativ ünvanın sildi.</item>
+        <item quantity="other">%1$s bu otaq üçün %2$s alternativ ünvanın sildi.</item>
+    </plurals>
 </resources>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Hlavní změny v této verzi: Element Android nyní používá Crypto Rust SDK.
		Úplný seznam změn: https://github.com/vector-im/element-android/releases
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Hlavní změny v této verzi: opravné vydání.
		Úplný seznam změn: https://github.com/vector-im/element-android/releases
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Die wichtigsten Änderungen in dieser Version: Element Android nutzt nun das Crypto-Rust-SDK.
		Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Main changes in this version: mainly bug fixes.
		Full changelog: https://github.com/vector-im/element-android/releases
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		تغییرات عمده در این نگارش: المنت اندروید اکنون از SDK راست Crypto استفاده می‌کند.
		گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		تغغیرات عمده در این نگارش: ارائه تصحیحی.
		گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Perubahan utama dalam versi ini: Element Android sekarang menggunakan SDK Kripto Rust.
		Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Perubahan utama dalam versi ini: rilis perbaikan.
		Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Principais mudanças nesta versão: Threads são agora habilitadas por padrão.
		Changelog completo: https://github.com/vector-im/element-android/releases
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Principais mudanças nesta versão: Basicamente correção de bugs!
		Changelog completo: https://github.com/vector-im/element-android/releases