Skip to content

Commit ad022b0

Browse files
ganfraganfra
committed
Merge branch 'release/0.6.4' into main
2 parents cec945c + f61f309 commit ad022b0

File tree

380 files changed

+3445
-1481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+3445
-1481
lines changed

‎.github/workflows/scripts/recordScreenshots.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ else
6666
fi
6767

6868
if [[ -z ${INPUT_AUTHOR_EMAIL} ]]; then
69-
git config user.email "benoitm+elementbot@element.io"
69+
git config user.email "android@element.io"
7070
else
7171
git config --local user.name "${INPUT_AUTHOR_EMAIL}"
7272
fi

‎CHANGES.md

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
1-
Changes in Element X v0.6.2 (2024-09-17)
1+
Changes in Element X v0.6.3 (2024-09-19)
22
========================================
33

4+
## What's Changed
5+
### 🙌 Improvements
6+
* Iterate send failure verification by @ganfra in https://github.com/element-hq/element-x-android/pull/3485
7+
### 🐛 Bugfixes
8+
* Make sure the logout action doesn't cause a crash by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3480
9+
* Distinguish between roomId and roomAlias. by @bmarty in https://github.com/element-hq/element-x-android/pull/3486
10+
* Fix sliding sync proxy login not working after native SS failure by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3489
11+
### Dependency upgrades
12+
* SDK 0.2.47 by @ganfra in https://github.com/element-hq/element-x-android/pull/3490
13+
### Others
14+
* Add tests on AccountDeactivationView by @bmarty in https://github.com/element-hq/element-x-android/pull/3481
15+
* Cleanup and fixtures for SDK classes. by @bmarty in https://github.com/element-hq/element-x-android/pull/3488
16+
* Timeline related improvements by @ganfra in https://github.com/element-hq/element-x-android/pull/3487
17+
* Room list : debounce subscribe to visible rooms. by @ganfra in https://github.com/element-hq/element-x-android/pull/3491
18+
* Improve code coverage metrics by @bmarty in https://github.com/element-hq/element-x-android/pull/3450
19+
420
### ✨ Features
521
* Account deactivation. by @bmarty in https://github.com/element-hq/element-x-android/pull/3479
622

‎app/src/main/kotlin/io/element/android/x/MainActivity.kt

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import io.element.android.libraries.architecture.bindings
3434
import io.element.android.libraries.core.log.logger.LoggerTag
3535
import io.element.android.libraries.designsystem.theme.ElementThemeApp
3636
import io.element.android.libraries.designsystem.utils.snackbar.LocalSnackbarDispatcher
37+
import io.element.android.services.analytics.compose.LocalAnalyticsService
3738
import io.element.android.x.di.AppBindings
3839
import io.element.android.x.intent.SafeUriHandler
3940
import kotlinx.coroutines.launch
@@ -64,6 +65,7 @@ class MainActivity : NodeActivity() {
6465
CompositionLocalProvider(
6566
LocalSnackbarDispatcher provides appBindings.snackbarDispatcher(),
6667
LocalUriHandler provides SafeUriHandler(this),
68+
LocalAnalyticsService provides appBindings.analyticsService(),
6769
) {
6870
Box(
6971
modifier = Modifier

‎app/src/main/kotlin/io/element/android/x/di/AppBindings.kt

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch
1616
import io.element.android.libraries.di.AppScope
1717
import io.element.android.libraries.matrix.api.tracing.TracingService
1818
import io.element.android.libraries.preferences.api.store.AppPreferencesStore
19+
import io.element.android.services.analytics.api.AnalyticsService
1920

2021
@ContributesTo(AppScope::class)
2122
interface AppBindings {
@@ -32,4 +33,6 @@ interface AppBindings {
3233
fun migrationEntryPoint(): MigrationEntryPoint
3334

3435
fun lockScreenEntryPoint(): LockScreenEntryPoint
36+
37+
fun analyticsService(): AnalyticsService
3538
}

‎appnav/src/main/res/values-be/translations.xml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="banner_migrate_to_native_sliding_sync_action">"Выйсці і абнавіць"</string>
4+
</resources>

‎build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ allprojects {
4848
config.from(files("$rootDir/tools/detekt/detekt.yml"))
4949
}
5050
dependencies {
51-
detektPlugins("io.nlopez.compose.rules:detekt:0.4.11")
51+
detektPlugins("io.nlopez.compose.rules:detekt:0.4.12")
5252
}
5353

5454
// KtLint

‎fastlane/metadata/android/en-US/changelogs/40006040.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Main changes in this version: mainly bug fixes.
2+
Full changelog: https://github.com/element-hq/element-x-android/releases

‎features/analytics/impl/src/main/res/values-et/translations.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<string name="screen_analytics_prompt_read_terms">"Sa võid lugeda meie kasutustingimusi %1$s"</string>
66
<string name="screen_analytics_prompt_read_terms_content_link">"siin"</string>
77
<string name="screen_analytics_prompt_settings">"Selle valiku saad igal ajal välja lülitada"</string>
8-
<string name="screen_analytics_prompt_third_party_sharing">"Me ei jaga andmeid kolmandate osapooltega"</string>
9-
<string name="screen_analytics_prompt_title">"Aita parandada %1$s rakendust"</string>
8+
<string name="screen_analytics_prompt_third_party_sharing">"Me ei jaga sinu andmeid kolmandate osapooltega"</string>
9+
<string name="screen_analytics_prompt_title">"Aita parandada rakendust %1$s"</string>
1010
</resources>

‎features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,11 @@ class ElementCallActivity :
281281

282282
@RequiresApi(Build.VERSION_CODES.O)
283283
override fun enterPipMode(): Boolean {
284-
return enterPictureInPictureMode(getPictureInPictureParams())
284+
return if (lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
285+
enterPictureInPictureMode(getPictureInPictureParams())
286+
} else {
287+
false
288+
}
285289
}
286290

287291
@RequiresApi(Build.VERSION_CODES.O)

‎features/deactivation/impl/src/main/res/values-cs/translations.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_deactivate_account_confirmation_dialog_content">"Potvrďte prosím, že chcete svůj účet deaktivovat. Tuto akci nelze vrátit zpět."</string>
4+
<string name="screen_deactivate_account_delete_all_messages">"Smazat všechny mé zprávy"</string>
5+
<string name="screen_deactivate_account_delete_all_messages_notice">"Upozornění: Budoucí uživatelé mohou vidět neúplné konverzace."</string>
6+
<string name="screen_deactivate_account_description">"Deaktivace vašeho účtu je %1$s, což způsobí:"</string>
7+
<string name="screen_deactivate_account_description_bold_part">"nezvratná"</string>
8+
<string name="screen_deactivate_account_list_item_1">"%1$s váš účet (nemůžete se znovu přihlásit a vaše ID nelze znovu použít)."</string>
9+
<string name="screen_deactivate_account_list_item_1_bold_part">"Trvale zakázat"</string>
10+
<string name="screen_deactivate_account_list_item_2">"Odebere vás ze všech chatovacích místností."</string>
11+
<string name="screen_deactivate_account_list_item_3">"Odstraní informace o vašem účtu z našeho serveru identit."</string>
12+
<string name="screen_deactivate_account_list_item_4">"Vaše zprávy budou stále viditelné registrovaným uživatelům, ale nebudou dostupné novým ani neregistrovaným uživatelům, pokud se rozhodnete je smazat."</string>
13+
<string name="screen_deactivate_account_title">"Deaktivovat účet"</string>
14+
</resources>

‎features/deactivation/impl/src/main/res/values-el/translations.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_deactivate_account_confirmation_dialog_content">"Παρακαλώ επιβεβαίωσε ότι θες να απενεργοποιήσεις τον λογαριασμό σου. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί."</string>
4+
<string name="screen_deactivate_account_delete_all_messages">"Διαγραφή όλων των μηνυμάτων μου"</string>
5+
<string name="screen_deactivate_account_delete_all_messages_notice">"Προειδοποίηση: Οι μελλοντικοί χρήστες ενδέχεται να βλέπουν ελλιπείς συνομιλίες."</string>
6+
<string name="screen_deactivate_account_description">"Η απενεργοποίηση του λογαριασμού σας είναι %1$s, θα:"</string>
7+
<string name="screen_deactivate_account_description_bold_part">"μη αναστρέψιμο"</string>
8+
<string name="screen_deactivate_account_list_item_1">"%1$s τον λογαριασμό σου (δεν μπορείς να συνδεθείς ξανά και το αναγνωριστικό σου δεν μπορεί να επαναχρησιμοποιηθεί)."</string>
9+
<string name="screen_deactivate_account_list_item_1_bold_part">"Μόνιμη απενεργοποίηση"</string>
10+
<string name="screen_deactivate_account_list_item_2">"Σε αφαιρέσει από όλα τα δωμάτια συνομιλίας."</string>
11+
<string name="screen_deactivate_account_list_item_3">"Διαγράψει τα στοιχεία του λογαριασμού σου από τον διακομιστή ταυτότητάς μας."</string>
12+
<string name="screen_deactivate_account_list_item_4">"Τα μηνύματά σου θα εξακολουθούν να είναι ορατά στους εγγεγραμμένους χρήστες, αλλά δεν θα είναι διαθέσιμα σε νέους ή μη εγγεγραμμένους χρήστες εάν επιλέξεις να τα διαγράψεις."</string>
13+
<string name="screen_deactivate_account_title">"Απενεργοποίηση λογαριασμού"</string>
14+
</resources>

‎features/deactivation/impl/src/main/res/values-et/translations.xml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_deactivate_account_confirmation_dialog_content">"Palun kinnita uuesti, et soovid eemaldada oma konto kasutusest"</string>
4+
<string name="screen_deactivate_account_delete_all_messages">"Kustuta kõik minu sõnumid"</string>
5+
<string name="screen_deactivate_account_title">"Eemalda konto kasutusest"</string>
6+
</resources>

‎features/deactivation/impl/src/main/res/values-fr/translations.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_deactivate_account_confirmation_dialog_content">"Veuillez confirmer que vous souhaitez désactiver votre compte. Cette action ne peut pas être annulée."</string>
4+
<string name="screen_deactivate_account_delete_all_messages">"Supprimer tous mes messages"</string>
5+
<string name="screen_deactivate_account_delete_all_messages_notice">"Attention : les futurs utilisateurs pourraient voir des conversations incomplètes."</string>
6+
<string name="screen_deactivate_account_description">"La désactivation de votre compte est %1$s, cela va:"</string>
7+
<string name="screen_deactivate_account_description_bold_part">"irréversible"</string>
8+
<string name="screen_deactivate_account_list_item_1">"%1$s votre compte (vous ne pourrez plus vous reconnecter et votre identifiant ne pourra pas être réutilisé)."</string>
9+
<string name="screen_deactivate_account_list_item_1_bold_part">"Désactiver définitivement"</string>
10+
<string name="screen_deactivate_account_list_item_2">"Vous retirer de tous les salons et toutes les discussions."</string>
11+
<string name="screen_deactivate_account_list_item_3">"Supprimer les informations de votre compte du serveur d’identité."</string>
12+
<string name="screen_deactivate_account_list_item_4">"Rendre vos messages invisibles aux futurs membres des salons si vous choisissez de les supprimer. Vos messages seront toujours visibles pour les utilisateurs qui les ont déjà récupérés."</string>
13+
<string name="screen_deactivate_account_title">"Désactiver votre compte"</string>
14+
</resources>

‎features/deactivation/impl/src/main/res/values-hu/translations.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_deactivate_account_confirmation_dialog_content">"Erősítse meg, hogy deaktiválja a fiókját. Ez a művelet nem vonható vissza."</string>
4+
<string name="screen_deactivate_account_delete_all_messages">"Összes saját üzenet törlése"</string>
5+
<string name="screen_deactivate_account_delete_all_messages_notice">"Figyelmeztetés: A jövőbeli felhasználók hiányos beszélgetéseket láthatnak."</string>
6+
<string name="screen_deactivate_account_description">"A fiók deaktiválása %1$s, a következőket okozza:"</string>
7+
<string name="screen_deactivate_account_description_bold_part">"visszafordíthatatlan"</string>
8+
<string name="screen_deactivate_account_list_item_1">"%1$s a fiókját (nem fog tudni újra bejelentkezni, és az azonosítója nem használható újra)."</string>
9+
<string name="screen_deactivate_account_list_item_1_bold_part">"Véglegesen letiltja"</string>
10+
<string name="screen_deactivate_account_list_item_2">"Eltávolításra kerül az összes csevegőszobából."</string>
11+
<string name="screen_deactivate_account_list_item_3">"Törlésre kerülnek a fiókadatai a személyazonosító kiszolgálónkról."</string>
12+
<string name="screen_deactivate_account_list_item_4">"Üzenetei továbbra is láthatóak maradnak a regisztrált felhasználók számára, de nem lesznek elérhetőek az új vagy nem regisztrált felhasználók számára, ha úgy dönt, hogy törli őket."</string>
13+
<string name="screen_deactivate_account_title">"Fiók deaktiválása"</string>
14+
</resources>

‎features/deactivation/impl/src/main/res/values-ru/translations.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_deactivate_account_confirmation_dialog_content">"Подтвердите, что вы хотите деактивировать свою учетную запись. Это действие не может быть отменено."</string>
4+
<string name="screen_deactivate_account_delete_all_messages">"Удалить все мои сообщения"</string>
5+
<string name="screen_deactivate_account_delete_all_messages_notice">"Предупреждение: будущие пользователи могут увидеть незавершенные разговоры."</string>
6+
<string name="screen_deactivate_account_description">"Деактивация вашей учетной записи %1$s означает следующее:"</string>
7+
<string name="screen_deactivate_account_description_bold_part">"необратимый"</string>
8+
<string name="screen_deactivate_account_list_item_1">"%1$s вашей учетной записи (вы не можете войти в систему снова, и ваш ID не может быть использован повторно)."</string>
9+
<string name="screen_deactivate_account_list_item_1_bold_part">"Отключить навсегда"</string>
10+
<string name="screen_deactivate_account_list_item_2">"Удалите вас из всех чатов."</string>
11+
<string name="screen_deactivate_account_list_item_3">"Удалите данные своей учетной записи с нашего сервера идентификации."</string>
12+
<string name="screen_deactivate_account_list_item_4">"Ваши сообщения по-прежнему будут видны зарегистрированным пользователям, но не будут доступны новым или незарегистрированным пользователям, если вы решите удалить их."</string>
13+
<string name="screen_deactivate_account_title">"Отключить учётную запись"</string>
14+
</resources>

‎features/deactivation/impl/src/main/res/values-sk/translations.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_deactivate_account_confirmation_dialog_content">"Prosím potvrďte, že chcete deaktivovať svoj účet. Túto akciu nie je možné vrátiť späť."</string>
4+
<string name="screen_deactivate_account_delete_all_messages">"Vymazať všetky moje správy"</string>
5+
<string name="screen_deactivate_account_delete_all_messages_notice">"Upozornenie: Budúcim používateľom sa môžu zobraziť neúplné konverzácie."</string>
6+
<string name="screen_deactivate_account_description">"Deaktivácia vášho účtu znamená %1$s, že:"</string>
7+
<string name="screen_deactivate_account_description_bold_part">"nezvratný"</string>
8+
<string name="screen_deactivate_account_list_item_1_bold_part">"Natrvalo zakázať"</string>
9+
<string name="screen_deactivate_account_list_item_4">"Vaše správy budú stále viditeľné pre registrovaných používateľov, ale nebudú dostupné pre nových alebo neregistrovaných používateľov, ak sa ich rozhodnete odstrániť."</string>
10+
<string name="screen_deactivate_account_title">"Deaktivovať účet"</string>
11+
</resources>

‎features/lockscreen/impl/src/main/res/values-et/translations.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<string name="screen_app_lock_setup_biometric_unlock_subtitle">"Säästa aega ja kasuta alati %1$s rakenduse lukustuse eemaldamiseks"</string>
1515
<string name="screen_app_lock_setup_choose_pin">"Vali PIN-kood"</string>
1616
<string name="screen_app_lock_setup_confirm_pin">"Korda PIN-koodi"</string>
17-
<string name="screen_app_lock_setup_pin_context">"Lisamaks oma %1$s vestlustele turvalisust ja privaatsust, lukusta oma nutiseade.
17+
<string name="screen_app_lock_setup_pin_context">"Lisamaks oma %1$s rakenduse vestlustele turvalisust ja privaatsust, lukusta oma nutiseade.
1818

1919
Vali midagi, mis hästi meelde jääb. Kui unustad selle PIN-koodi, siis turvakaalutlustel logitakse sind rakendusest välja."</string>
2020
<string name="screen_app_lock_setup_pin_forbidden_dialog_content">"Turvakaalutlustel sa ei saa sellist PIN-koodi kasutada"</string>
@@ -31,7 +31,7 @@ Vali midagi, mis hästi meelde jääb. Kui unustad selle PIN-koodi, siis turvaka
3131
<item quantity="one">"Vale PIN-kood. Saad proovida veel %1$d korra"</item>
3232
<item quantity="other">"Vale PIN-kood. Saad proovida veel %1$d korda"</item>
3333
</plurals>
34-
<string name="screen_app_lock_use_biometric_android">"Kasuta biomeetrilist tuvastust"</string>
34+
<string name="screen_app_lock_use_biometric_android">"Kasuta biomeetriat"</string>
3535
<string name="screen_app_lock_use_pin_android">"Kasuta PIN-koodi"</string>
3636
<string name="screen_signout_in_progress_dialog_content">"Logime välja…"</string>
3737
</resources>

‎features/login/impl/src/main/res/values-be/translations.xml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<string name="screen_change_server_form_notice">"Вы можаце падключыцца толькі да існуючага сервера, які падтрымлівае sliding sync. Адміністратару хатняга сервера запатрабуецца наладзіць яго. %1$s"</string>
2222
<string name="screen_change_server_subtitle">"Які адрас вашага сервера?"</string>
2323
<string name="screen_change_server_title">"Выберыце свой сервер"</string>
24+
<string name="screen_create_account_title">"Стварыць уліковы запіс"</string>
2425
<string name="screen_login_error_deactivated_account">"Гэты ўліковы запіс быў дэактываваны."</string>
2526
<string name="screen_login_error_invalid_credentials">"Няправільнае імя карыстальніка і/або пароль"</string>
2627
<string name="screen_login_error_invalid_user_id">"Гэта несапраўдны ідэнтыфікатар карыстальніка. Чаканы фармат: ‘@user:homeserver.org’"</string>

‎features/login/impl/src/main/res/values-cs/translations.xml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<string name="screen_change_server_form_notice">"Můžete se připojit pouze k serveru, který podporuje klouzavou synchronizaci. Správce vašeho domovského serveru jej bude muset nakonfigurovat. %1$s"</string>
2222
<string name="screen_change_server_subtitle">"Jaká je adresa vašeho serveru?"</string>
2323
<string name="screen_change_server_title">"Vyberte váš server"</string>
24+
<string name="screen_create_account_title">"Vytvořit účet"</string>
2425
<string name="screen_login_error_deactivated_account">"Tento účet byl deaktivován."</string>
2526
<string name="screen_login_error_invalid_credentials">"Nesprávné uživatelské jméno nebo heslo"</string>
2627
<string name="screen_login_error_invalid_user_id">"Toto není platný identifikátor uživatele. Očekávaný formát: \'@user:homeserver.org\'"</string>

0 commit comments

Comments
 (0)