Merge branch 'release/0.6.4' into main

Author: ganfra

.github/workflows/scripts/recordScreenshots.sh

@@ -66,7 +66,7 @@ else
 fi
 
 if [[ -z ${INPUT_AUTHOR_EMAIL} ]]; then
-  git config user.email "benoitm+elementbot@element.io"
+  git config user.email "android@element.io"
 else
   git config --local user.name "${INPUT_AUTHOR_EMAIL}"
 fi

CHANGES.md

@@ -1,6 +1,22 @@
-Changes in Element X v0.6.2 (2024-09-17)
+Changes in Element X v0.6.3 (2024-09-19)
 ========================================
 
+## What's Changed
+### 🙌 Improvements
+* Iterate send failure verification by @ganfra in https://github.com/element-hq/element-x-android/pull/3485
+### 🐛 Bugfixes
+* Make sure the logout action doesn't cause a crash by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3480
+* Distinguish between roomId and roomAlias. by @bmarty in https://github.com/element-hq/element-x-android/pull/3486
+* Fix sliding sync proxy login not working after native SS failure by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3489
+### Dependency upgrades
+* SDK 0.2.47 by @ganfra in https://github.com/element-hq/element-x-android/pull/3490
+### Others
+* Add tests on AccountDeactivationView by @bmarty in https://github.com/element-hq/element-x-android/pull/3481
+* Cleanup and fixtures for SDK classes. by @bmarty in https://github.com/element-hq/element-x-android/pull/3488
+* Timeline related improvements by @ganfra in https://github.com/element-hq/element-x-android/pull/3487
+* Room list : debounce subscribe to visible rooms. by @ganfra in https://github.com/element-hq/element-x-android/pull/3491
+* Improve code coverage metrics by @bmarty in https://github.com/element-hq/element-x-android/pull/3450
+
 ### ✨ Features
 * Account deactivation. by @bmarty in https://github.com/element-hq/element-x-android/pull/3479
 

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

@@ -34,6 +34,7 @@ import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
 import io.element.android.libraries.designsystem.utils.snackbar.LocalSnackbarDispatcher
+import io.element.android.services.analytics.compose.LocalAnalyticsService
 import io.element.android.x.di.AppBindings
 import io.element.android.x.intent.SafeUriHandler
 import kotlinx.coroutines.launch
@@ -64,6 +65,7 @@ class MainActivity : NodeActivity() {
             CompositionLocalProvider(
                 LocalSnackbarDispatcher provides appBindings.snackbarDispatcher(),
                 LocalUriHandler provides SafeUriHandler(this),
+                LocalAnalyticsService provides appBindings.analyticsService(),
             ) {
                 Box(
                     modifier = Modifier

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

@@ -16,6 +16,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.tracing.TracingService
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.services.analytics.api.AnalyticsService
 
 @ContributesTo(AppScope::class)
 interface AppBindings {
@@ -32,4 +33,6 @@ interface AppBindings {
     fun migrationEntryPoint(): MigrationEntryPoint
 
     fun lockScreenEntryPoint(): LockScreenEntryPoint
+
+    fun analyticsService(): AnalyticsService
 }

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

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

build.gradle.kts

@@ -48,7 +48,7 @@ allprojects {
         config.from(files("$rootDir/tools/detekt/detekt.yml"))
     }
     dependencies {
-        detektPlugins("io.nlopez.compose.rules:detekt:0.4.11")
+        detektPlugins("io.nlopez.compose.rules:detekt:0.4.12")
     }
 
     // KtLint

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

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

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

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

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

@@ -281,7 +281,11 @@ class ElementCallActivity :
 
     @RequiresApi(Build.VERSION_CODES.O)
     override fun enterPipMode(): Boolean {
-        return enterPictureInPictureMode(getPictureInPictureParams())
+        return if (lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
+            enterPictureInPictureMode(getPictureInPictureParams())
+        } else {
+            false
+        }
     }
 
     @RequiresApi(Build.VERSION_CODES.O)

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <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>
+  <string name="screen_deactivate_account_delete_all_messages">"Smazat všechny mé zprávy"</string>
+  <string name="screen_deactivate_account_delete_all_messages_notice">"Upozornění: Budoucí uživatelé mohou vidět neúplné konverzace."</string>
+  <string name="screen_deactivate_account_description">"Deaktivace vašeho účtu je %1$s, což způsobí:"</string>
+  <string name="screen_deactivate_account_description_bold_part">"nezvratná"</string>
+  <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>
+  <string name="screen_deactivate_account_list_item_1_bold_part">"Trvale zakázat"</string>
+  <string name="screen_deactivate_account_list_item_2">"Odebere vás ze všech chatovacích místností."</string>
+  <string name="screen_deactivate_account_list_item_3">"Odstraní informace o vašem účtu z našeho serveru identit."</string>
+  <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>
+  <string name="screen_deactivate_account_title">"Deaktivovat účet"</string>
+</resources>