Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase against element android 1.6.6 #985

Merged
merged 85 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from 84 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
28da02c
Fixes #7758: Fixed JWT token for Jitsi openidtoken-jwt authentication
tomtit Apr 18, 2023
313d4f8
Merge tag 'v1.6.5' into develop
bmarty Jul 25, 2023
9aeb3b7
version++
bmarty Jul 25, 2023
e567b9c
Translated using Weblate (Latvian)
Jul 25, 2023
975ef3c
Merge branch 'origin/develop' into Weblate.
weblate Jul 25, 2023
95b63cc
Translated using Weblate (Latvian)
Jul 25, 2023
cd7bf12
Translated using Weblate (Latvian)
Jul 28, 2023
fd46487
Translated using Weblate (Portuguese (Brazil))
rffontenelle Jul 27, 2023
10cde1f
Translated using Weblate (Portuguese (Brazil))
rffontenelle Jul 27, 2023
40fd9f2
Translated using Weblate (Latvian)
Jul 28, 2023
27bae30
Translated using Weblate (Latvian)
Jul 29, 2023
1bbd4b7
Translated using Weblate (Latvian)
Jul 31, 2023
380a0b8
Translated using Weblate (Turkish)
BrkMrst Jul 30, 2023
8885d14
Translated using Weblate (Russian)
Aug 4, 2023
5580f30
Translated using Weblate (Ukrainian)
IhorHordiichuk Aug 6, 2023
3090688
Translated using Weblate (Azerbaijani)
Qaz-6 Aug 9, 2023
754ea6a
Translated using Weblate (Ukrainian)
IhorHordiichuk Aug 8, 2023
45be274
Translated using Weblate (Azerbaijani)
Qaz-6 Aug 10, 2023
ad79348
Translated using Weblate (Vietnamese)
hahahahacker2009 Aug 12, 2023
23e7bdb
Translated using Weblate (German)
franconian Aug 13, 2023
eeb67e1
Translated using Weblate (German)
franconian Aug 13, 2023
3216fa6
Translated using Weblate (Chinese (Simplified))
Aug 15, 2023
83e2419
Translated using Weblate (Chinese (Traditional))
Aug 15, 2023
92399ab
Translated using Weblate (Swedish)
LinAGKar Aug 17, 2023
39a7831
Hide setting entry point to manage 3Pid if homeserver capability `m.3…
bmarty Aug 21, 2023
8f6edba
Fix typo
bmarty Aug 21, 2023
12395e9
OIDC redirect to the web page to delete a session (legacy session man…
bmarty Aug 22, 2023
4254415
Format
bmarty Aug 22, 2023
8941e63
Hide multi signout if we have an external account manager (#8616)
bmarty Aug 22, 2023
880ed69
OIDC redirect to the web page to delete a session (new session manage…
bmarty Aug 22, 2023
dc19380
Changelog
bmarty Aug 22, 2023
87e5900
Merge pull request #8618 from vector-im/feature/bma/3pidCapability
bmarty Aug 22, 2023
2b29a57
Merge branch 'origin/develop' into Weblate.
weblate Aug 22, 2023
9821487
Translated using Weblate (German)
Aug 22, 2023
6379420
Translated using Weblate (Persian)
danialbehzadi Aug 22, 2023
ce5d42d
Translated using Weblate (Persian)
danialbehzadi Aug 22, 2023
1eee5c1
Translated using Weblate (Czech)
waclaw66 Aug 22, 2023
de688aa
Fix SAS strings import URL
turt2live Aug 22, 2023
6e6478a
add changelog
turt2live Aug 22, 2023
df97229
Translated using Weblate (Slovak)
dodog Aug 22, 2023
494e824
Translated using Weblate (Ukrainian)
IhorHordiichuk Aug 22, 2023
003a134
Translated using Weblate (Chinese (Traditional))
s8321414 Aug 23, 2023
e6a18a2
Translated using Weblate (Indonesian)
Linerly Aug 23, 2023
a5d231c
Merge pull request #8623 from vector-im/travis/fix-sas-import
Florian14 Aug 23, 2023
52aa4bb
Translated using Weblate (Turkish)
bmarty Aug 23, 2023
1ceacdd
Merge branch 'origin/develop' into Weblate.
weblate Aug 23, 2023
81f7517
Be able to trigger manually this workflow.
bmarty Aug 23, 2023
e6bd57d
Sync SAS Strings
bmarty Aug 23, 2023
6d5f59c
Merge branch 'origin/develop' into Weblate.
weblate Aug 23, 2023
e2c7833
Translated using Weblate (Albanian)
ujdhesa Aug 23, 2023
b5c224f
Translated using Weblate (Albanian)
ujdhesa Aug 23, 2023
ca109f7
Merge pull request #8626 from vector-im/sync-sas-strings
bmarty Aug 23, 2023
bc23f82
Merge pull request #8625 from RiotTranslateBot/weblate-element-androi…
bmarty Aug 23, 2023
0a6dbeb
Remove unsupported language. We may handle that during the next SAS s…
bmarty Aug 23, 2023
751bd27
Bump org.matrix.rustcomponents:crypto-android from 0.3.10 to 0.3.14
dependabot[bot] Aug 25, 2023
a3be028
Merge pull request #8341 from tomtit/bugfix/issue-7758
bmarty Aug 28, 2023
0838a10
Bump memory allocated for tests
jmartinesp Aug 28, 2023
dc8230e
Ignore `LocaleFolder` lint error since we won't fix it.
jmartinesp Aug 28, 2023
d65459c
Try bumping the whole memory heap size in rust tests
jmartinesp Aug 28, 2023
fe51ee3
Try bumping heap size of gradle and the kotlin daemon as a last resort
jmartinesp Aug 28, 2023
1f41c54
Merge pull request #8630 from vector-im/dependabot/gradle/org.matrix.…
jmartinesp Aug 29, 2023
a889d8d
Store the authentication issuer into DB.
bmarty Aug 31, 2023
52a0693
Change the test to hide multi signout of devices.
bmarty Aug 31, 2023
ec9a066
Merge pull request #8620 from vector-im/feature/bma/oidcSessionEnd
bmarty Sep 12, 2023
d31c741
Hide deactivate account section in case of account managed externally.
bmarty Aug 23, 2023
ff548d2
Fix crash when max shortcuts count is exceeded (#8644)
yostyle Sep 13, 2023
470557c
Open OIDC account management URL in chrome tab
hughns Sep 14, 2023
3f2f386
Changelog
hughns Sep 14, 2023
8c1cc44
Merge pull request #8627 from vector-im/feature/bma/hideAccountDeacti…
bmarty Sep 14, 2023
1b3be24
Merge pull request #8645 from vector-im/hughns/oidc-device-logout-in-…
bmarty Sep 14, 2023
3b9daec
Fix QR code login support in rust
BillCarsonFr Sep 27, 2023
6ee438d
bump crypto sdk
BillCarsonFr Oct 1, 2023
42eec4b
update changelog
BillCarsonFr Oct 1, 2023
0d70f6e
missing mock
BillCarsonFr Oct 1, 2023
2709cb2
missing deprecated
BillCarsonFr Oct 1, 2023
1bd2da5
disable flacky test on legacy crypto
BillCarsonFr Oct 2, 2023
87df8ab
Update matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sd…
BillCarsonFr Oct 3, 2023
a015eda
code review
BillCarsonFr Oct 3, 2023
59ddf1a
Merge pull request #8654 from vector-im/bca/fix_8653_qr_code
BillCarsonFr Oct 3, 2023
d379cef
Changelog for version 1.6.6
Oct 5, 2023
7001f21
Adding fastlane file for version 1.6.6
Oct 5, 2023
4fa634a
Merge branch 'release/1.6.6' into main
Oct 5, 2023
d14bc0f
Merge vector-im/element-android v1.6.6 into element-rebase
yostyle Oct 25, 2023
253e9b6
Fix conflict
yostyle Oct 25, 2023
a2ad806
add changelog
yostyle Oct 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_er.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sync-from-external-sources.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/tests-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
18 changes: 18 additions & 0 deletions ELEMENT_CHANGES.md
Original file line number Diff line number Diff line change
@@ -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)
======================================

Expand Down
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,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 ->
Expand Down
2 changes: 2 additions & 0 deletions fastlane/metadata/android/cs-CZ/changelogs/40106030.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/cs-CZ/changelogs/40106050.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/de-DE/changelogs/40106030.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/de-DE/changelogs/40106050.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Die wichtigsten Änderungen in dieser Version: Fehlerbehebungen.
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/40106060.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/fa/changelogs/40106030.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
تغییرات عمده در این نگارش: المنت اندروید اکنون از SDK راست Crypto استفاده می‌کند.
گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
2 changes: 2 additions & 0 deletions fastlane/metadata/android/fa/changelogs/40106050.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
تغغیرات عمده در این نگارش: ارائه تصحیحی.
گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
2 changes: 2 additions & 0 deletions fastlane/metadata/android/id/changelogs/40106030.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/id/changelogs/40106050.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105160.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105180.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105200.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105220.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105240.txt
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, em especial a correção da mensagem não aparecer na linha do tempo.
Changelog completo: https://github.com/vector-im/element-android/releases
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105250.txt
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, em especial a correção da mensagem não aparecer na linha do tempo.
Changelog completo: https://github.com/vector-im/element-android/releases
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105260.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105280.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105300.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40105320.txt
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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40106000.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40106010.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pt-BR/changelogs/40106020.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/sk/changelogs/40106030.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/sk/changelogs/40106050.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Hlavné zmeny v tejto verzii: opravné vydanie.
Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
2 changes: 2 additions & 0 deletions fastlane/metadata/android/sq/changelogs/40106030.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/sq/changelogs/40106050.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions fastlane/metadata/android/uk/changelogs/40106030.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Основні зміни в цій версії: Element для Android відтепер використовує Crypto Rust SDK.
Список усіх змін: https://github.com/vector-im/element-android/releases
2 changes: 2 additions & 0 deletions fastlane/metadata/android/uk/changelogs/40106050.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Основні зміни в цій версії: коригувальний випуск.
Список усіх змін: https://github.com/vector-im/element-android/releases
2 changes: 2 additions & 0 deletions fastlane/metadata/android/zh-TW/changelogs/40106030.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
此版本的主要變更:現在起,Element Android 使用 Crypto Rust SDK。
完整的變更紀錄:https://github.com/vector-im/element-android/releases
2 changes: 2 additions & 0 deletions fastlane/metadata/android/zh-TW/changelogs/40106050.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
此版本中的主要變動:版本修正。
完整的變更紀錄:https://github.com/vector-im/element-android/releases
Loading
Loading