Merge branch 'release/25.08.0' into main

Author: ganfra

.maestro/tests/roomList/timeline/messages/text.yaml

@@ -4,6 +4,6 @@ appId: ${MAESTRO_APP_ID}
 - tapOn:
     id: "text_editor"
 - inputText: "Hello world!"
-- tapOn: "Send"
+- tapOn: "Send message"
 - hideKeyboard
 - takeScreenshot: build/maestro/511-Timeline

.maestro/tests/roomList/timeline/timeline.yaml

@@ -6,6 +6,9 @@ appId: ${MAESTRO_APP_ID}
 - runFlow: messages/text.yaml
 - runFlow: messages/location.yaml
 - runFlow: messages/poll.yaml
-- runFlow: call/call.yaml
+
+# Restore once the call flow is fixed
+#- runFlow: call/call.yaml
+
 - back
 - runFlow: ../../assertions/assertHomeDisplayed.yaml

CHANGES.md

@@ -1,3 +1,51 @@
+Changes in Element X v25.07.1
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v25.07.1 -->
+
+## What's Changed
+### 🐛 Bugfixes
+* fix ( room list) : rebuild with filteredSummaries to avoid bad state by @ganfra in https://github.com/element-hq/element-x-android/pull/4993
+* Keep video rotation metadata when transcoding by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5008
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/4988
+### 🧱 Build
+* Update Gradle Wrapper from 8.14.2 to 8.14.3 by @ElementBot in https://github.com/element-hq/element-x-android/pull/4985
+* Stop ignoring dependencies, but instead set `open-pull-requests-limit to 0 by @bmarty in https://github.com/element-hq/element-x-android/pull/5013
+### 📄 Documentation
+* Update to the status and clarifications with respect to the legacy app. by @mxandreas in https://github.com/element-hq/element-x-android/pull/5016
+### 🚧 In development 🚧
+* Home navigation bar fixes by @bmarty in https://github.com/element-hq/element-x-android/pull/4990
+* Home screen iteration by @bmarty in https://github.com/element-hq/element-x-android/pull/5003
+### Dependency upgrades
+* Update dependency io.element.android:compound-android to v25.7.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/4984
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.7.7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/4989
+* Update plugin ktlint to v13 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/4992
+* Update dependency org.jetbrains.kotlinx:kotlinx-datetime to v0.7.1-0.6.x-compat by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/4991
+* Update haze to v1.6.7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/4987
+* Update dependency com.squareup.okhttp3:okhttp-bom to v5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/4979
+* Update dependency io.sentry:sentry-android to v8.17.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/4998
+* Update dependency com.squareup.okhttp3:okhttp-bom to v5.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/4997
+* Update dependency org.maplibre.gl:android-sdk to v11.12.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5001
+* Update dependency com.posthog:posthog-android to v3.19.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5009
+* Update dependency org.maplibre.gl:android-sdk to v11.12.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5006
+* Update android.gradle.plugin to v8.11.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5014
+* Update rnkdsh/action-upload-diawi action to v1.5.10 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5019
+* Update wysiwyg to v2.38.5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5025
+* Update haze to v1.6.8 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5026
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.7.15 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5011
+### Others
+* Remove bloom effect and replace by linear gradient by @bmarty in https://github.com/element-hq/element-x-android/pull/4926
+* misc (a11y) : mark MainActionButton icon as decorative by @ganfra in https://github.com/element-hq/element-x-android/pull/4996
+* Make `ContentAvoidingLayoutData` an immutable data class by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4999
+* Remove unused composable and cleanup colors by @bmarty in https://github.com/element-hq/element-x-android/pull/5000
+* Add a feature flag to reuse the last `pos` value for initial syncs by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5010
+* [a11y] Fix several issues around accessibility by @bmarty in https://github.com/element-hq/element-x-android/pull/5007
+* Replace video transcoder with Media3 Transformer by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5018
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.07.0...v25.07.1
+
 Changes in Element X v25.07.0
 =============================
 

build.gradle.kts

@@ -49,7 +49,7 @@ allprojects {
         config.from(files("$rootDir/tools/detekt/detekt.yml"))
     }
     dependencies {
-        detektPlugins("io.nlopez.compose.rules:detekt:0.4.22")
+        detektPlugins("io.nlopez.compose.rules:detekt:0.4.26")
         detektPlugins(project(":tests:detekt-rules"))
     }
 

docs/_developer_onboarding.md

@@ -33,7 +33,7 @@
 
 This doc is a quick introduction about the project and its architecture.
 
-It's aim is to help new developers to understand the overall project and where to start developing.
+Its aim is to help new developers to understand the overall project and where to start developing.
 
 Other useful documentation:
 
@@ -157,6 +157,8 @@ Troubleshooting:
  - If you get the error `Unsupported class file major version <n>`, try changing your JVM version by setting
    `JAVA_HOME` and, if building via Android Studio, "File | Settings | Build, Execution, Deployment | Build Tools | Gradle | Gradle JDK".
 
+You can switch back to using the published version of the SDK by deleting `libraries/rustsdk/matrix-rust-sdk.aar`.
+
 ### The Android project
 
 The project should compile out of the box.

docs/notifications.md

@@ -149,7 +149,7 @@ That is why clients are able to **process the push rules client side** to decide
 
 As seen previously, App developers don't directly send a push to the end user's device, they use a Push Provider as intermediary. So technically this intermediary is able to read the content of what is sent.
 
-App developers usually mitigate this by sending a `silent notification`, that is a notification with no identifiable data, or with an encrypted payload. When the push is received the app can then synchronise to it's server in order to generate a local notification.
+App developers usually mitigate this by sending a `silent notification`, that is a notification with no identifiable data, or with an encrypted payload. When the push is received the app can then synchronise to its server in order to generate a local notification.
 
 
 ### Background processing limitations

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

@@ -0,0 +1,2 @@
+Main changes in this version: start support for room v12, bug fixes and general improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases

fastlane/metadata/android/en-US/full_description.txt

@@ -22,7 +22,7 @@ Choose where to host your data - from any public server (the largest free server
 Use Element everywhere. Stay in touch wherever you are with fully synchronised message history across all your devices, including on the web at https://app.element.io
 
 <b>Element X is our next-generation app</b>
-If you’re using the original Element app, it’s time to try Element X! It’s faster, easier to use, and more powerful than the original app. It’s better in every way and we’re adding new features all the time.
+If you’re using the previous-generation Element Classic app, it’s time to try Element X! It’s faster, easier to use, and more powerful than the classic app. It’s better in every way and we’re adding new features all the time.
 
 The application requires the android.permission.REQUEST_INSTALL_PACKAGES permission to enable the installation of applications received as attachments, ensuring seamless and convenient access to new software within the app.
 

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt

@@ -29,13 +29,13 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
 import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
+import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
 import io.element.android.libraries.designsystem.atomic.organisms.InfoListItem
 import io.element.android.libraries.designsystem.atomic.organisms.InfoListOrganism
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
 import io.element.android.libraries.designsystem.background.OnboardingBackground
 import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.ClickableLinkText
-import io.element.android.libraries.designsystem.components.PageTitle
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.buildAnnotatedStringWithStyledPart
@@ -89,10 +89,10 @@ private fun AnalyticsOptInHeader(
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        PageTitle(
-            modifier = Modifier.padding(top = 60.dp, bottom = 12.dp),
+        IconTitleSubtitleMolecule(
+            modifier = Modifier.padding(top = 60.dp, bottom = 28.dp),
             title = stringResource(id = R.string.screen_analytics_prompt_title, state.applicationName),
-            subtitle = stringResource(id = R.string.screen_analytics_prompt_help_us_improve),
+            subTitle = stringResource(id = R.string.screen_analytics_prompt_help_us_improve),
             iconStyle = BigIcon.Style.Default(CompoundIcons.Chart())
         )
         if (state.hasPolicyLink) {

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt

@@ -21,6 +21,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlinx.serialization.json.Json
@@ -84,6 +86,11 @@ class WebViewAudioManager(
             ?.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, "${webView.context.packageName}:ProximitySensorCallWakeLock")
     }
 
+    /**
+     * Used to ensure that only one coroutine can access the proximity sensor wake lock at a time, preventing re-acquiring or re-releasing it.
+     */
+    private val proximitySensorMutex = Mutex()
+
     /**
      * This listener tracks the current communication device and updates the WebView when it changes.
      */
@@ -208,8 +215,12 @@ class WebViewAudioManager(
             return
         }
 
-        if (proximitySensorWakeLock?.isHeld == true) {
-            proximitySensorWakeLock?.release()
+        coroutineScope.launch {
+            proximitySensorMutex.withLock {
+                if (proximitySensorWakeLock?.isHeld == true) {
+                    proximitySensorWakeLock?.release()
+                }
+            }
         }
 
         audioManager.mode = AudioManager.MODE_NORMAL
@@ -397,13 +408,17 @@ class WebViewAudioManager(
 
         expectedNewCommunicationDeviceId = null
 
-        @Suppress("WakeLock", "WakeLockTimeout")
-        if (device?.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE && proximitySensorWakeLock?.isHeld == false) {
-            // If the device is the built-in earpiece, we need to acquire the proximity sensor wake lock
-            proximitySensorWakeLock?.acquire()
-        } else if (proximitySensorWakeLock?.isHeld == true) {
-            // If the device is no longer the earpiece, we need to release the wake lock
-            proximitySensorWakeLock?.release()
+        coroutineScope.launch {
+            proximitySensorMutex.withLock {
+                @Suppress("WakeLock", "WakeLockTimeout")
+                if (device?.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE && proximitySensorWakeLock?.isHeld == false) {
+                    // If the device is the built-in earpiece, we need to acquire the proximity sensor wake lock
+                    proximitySensorWakeLock?.acquire()
+                } else if (proximitySensorWakeLock?.isHeld == true) {
+                    // If the device is no longer the earpiece, we need to release the wake lock
+                    proximitySensorWakeLock?.release()
+                }
+            }
         }
     }