Merge branch 'release/25.06.2' into main

Author: ganfra

CHANGES.md

@@ -1,3 +1,45 @@
+## What's Changed
+### ✨ Features
+* Enable support for Android Auto. by @bmarty in https://github.com/element-hq/element-x-android/pull/4818
+* Element Call: Add audio output selector handled by Android by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4663
+### 🙌 Improvements
+* Oidc: Fallback to external browser instead of using Webview by @bmarty in https://github.com/element-hq/element-x-android/pull/4808
+* change (room member moderation) : update icon to match figma by @ganfra in https://github.com/element-hq/element-x-android/pull/4837
+### 🐛 Bugfixes
+* Fix login flow by @bmarty in https://github.com/element-hq/element-x-android/pull/4813
+* fix: When sending media as files use the `octet-stream` type by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4815
+* fix: Make `Client.findDM` return a `Result` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4816
+* Mark room as fully read when user goes back to the room list. by @bmarty in https://github.com/element-hq/element-x-android/pull/2687
+* fix (identity change) :  RoomMemberIdentityStateChange in non encrypted room by @ganfra in https://github.com/element-hq/element-x-android/pull/4824
+* Fix room and user avatar downloaded with a `.bin` extension. by @bmarty in https://github.com/element-hq/element-x-android/pull/4830
+* Log the push resolving failure reason if available by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4835
+### 🧱 Build
+* Update Gradle Wrapper from 8.14.1 to 8.14.2 by @ElementBot in https://github.com/element-hq/element-x-android/pull/4831
+### Dependency upgrades
+* fix(deps): update dependency androidx.compose:compose-bom to v2025.04.01 by @renovate in https://github.com/element-hq/element-x-android/pull/4631
+* fix(deps): update dependency androidx.compose:compose-bom to v2025.05.01 by @renovate in https://github.com/element-hq/element-x-android/pull/4814
+* fix(deps): update dependency io.sentry:sentry-android to v8.13.2 by @renovate in https://github.com/element-hq/element-x-android/pull/4780
+* fix(deps): update appyx to v1.7.1 by @renovate in https://github.com/element-hq/element-x-android/pull/4672
+* fix(deps): update telephoto to v0.16.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4749
+* fix(deps): update coil to v3.2.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4712
+* fix(deps): update dependency androidx.webkit:webkit to v1.14.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4823
+* fix(deps): update dependency com.posthog:posthog-android to v3.17.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4827
+* fix(deps): update dependency io.element.android:element-call-embedded to v0.12.2 by @renovate in https://github.com/element-hq/element-x-android/pull/4832
+* fix(deps): update dependency com.google.firebase:firebase-bom to v33.15.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4833
+* fix(deps): update dependency org.maplibre.gl:android-sdk to v11.10.1 by @renovate in https://github.com/element-hq/element-x-android/pull/4825
+* fix(deps): update lifecycle to v2.9.1 by @renovate in https://github.com/element-hq/element-x-android/pull/4822
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.6.6 by @renovate in https://github.com/element-hq/element-x-android/pull/4834
+* fix(deps): update dependency io.element.android:opusencoder to v1.2.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4836
+### Others
+* Add `catchingExceptions` method to replace `runCatching` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4797
+* Rename classes overriding classes from the FFI layer. by @bmarty in https://github.com/element-hq/element-x-android/pull/4817
+* Fix coroutine scope by @bmarty in https://github.com/element-hq/element-x-android/pull/4820
+* Add extra logs the 'send call notification' flow by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4819
+* misc (matrix) : use innerClient.subscribeToRoomInfo sdk method by @ganfra in https://github.com/element-hq/element-x-android/pull/4838
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.06.0...v25.06.1
+
 Changes in Element X v25.06.0
 =============================
 

app/src/main/AndroidManifest.xml

@@ -122,6 +122,17 @@
                 <data android:scheme="https" />
                 <data android:host="matrix.to" />
             </intent-filter>
+            <!--
+              matrix: links
+            -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="matrix" />
+            </intent-filter>
             <!--
               links from matrix.to website
             -->

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

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

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

@@ -15,16 +15,19 @@ import android.os.Build
 import android.os.PowerManager
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
+import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlinx.serialization.json.Json
 import timber.log.Timber
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.time.Duration.Companion.milliseconds
 
 /**
  * This class manages the audio devices for a WebView.
@@ -66,23 +69,26 @@ class WebViewAudioManager(
     /**
      * This listener tracks the current communication device and updates the WebView when it changes.
      */
-    private val commsDeviceChangedListener = AudioManager.OnCommunicationDeviceChangedListener { device ->
-        if (device != null && device.id == expectedNewCommunicationDeviceId) {
-            expectedNewCommunicationDeviceId = null
-            Timber.d("Audio device changed, type: ${device.type}")
-            updateSelectedAudioDeviceInWebView(device.id.toString())
-        } else if (device != null && device.id != expectedNewCommunicationDeviceId) {
-            // We were expecting a device change but it didn't happen, so we should retry
-            val expectedDeviceId = expectedNewCommunicationDeviceId
-            if (expectedDeviceId != null) {
-                // Remove the expected id so we only retry once
+    @get:RequiresApi(Build.VERSION_CODES.S)
+    private val commsDeviceChangedListener by lazy {
+        AudioManager.OnCommunicationDeviceChangedListener { device ->
+            if (device != null && device.id == expectedNewCommunicationDeviceId) {
                 expectedNewCommunicationDeviceId = null
-                audioManager.selectAudioDevice(expectedDeviceId.toString())
+                Timber.d("Audio device changed, type: ${device.type}")
+                updateSelectedAudioDeviceInWebView(device.id.toString())
+            } else if (device != null && device.id != expectedNewCommunicationDeviceId) {
+                // We were expecting a device change but it didn't happen, so we should retry
+                val expectedDeviceId = expectedNewCommunicationDeviceId
+                if (expectedDeviceId != null) {
+                    // Remove the expected id so we only retry once
+                    expectedNewCommunicationDeviceId = null
+                    audioManager.selectAudioDevice(expectedDeviceId.toString())
+                }
+            } else {
+                Timber.d("Audio device cleared")
+                expectedNewCommunicationDeviceId = null
+                audioManager.selectAudioDevice(null)
             }
-        } else {
-            Timber.d("Audio device cleared")
-            expectedNewCommunicationDeviceId = null
-            audioManager.selectAudioDevice(null)
         }
     }
 
@@ -217,6 +223,10 @@ class WebViewAudioManager(
             },
             onAudioPlaybackStarted = {
                 coroutineScope.launch(Dispatchers.Main) {
+                    // Even with the callback, it seems like starting the audio takes a bit on the webview side,
+                    // so we add an extra delay here to make sure it's ready
+                    delay(500.milliseconds)
+
                     // Calling this ahead of time makes the default audio device to not use the right audio stream
                     setAvailableAudioDevices()
 

features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt

@@ -83,7 +83,7 @@ import kotlin.time.Duration.Companion.seconds
 
     @Test
     fun `present - with CallType RoomCall sets call as active, loads URL, runs WidgetDriver and notifies the other clients a call started`() = runTest {
-        val sendCallNotificationIfNeededLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val sendCallNotificationIfNeededLambda = lambdaRecorder<Result<Boolean>> { Result.success(true) }
         val syncService = FakeSyncService(SyncState.Running)
         val fakeRoom = FakeJoinedRoom(sendCallNotificationIfNeededResult = sendCallNotificationIfNeededLambda)
         val client = FakeMatrixClient(syncService = syncService).apply {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/ExpandableBottomSheetScaffold.kt

@@ -10,7 +10,10 @@
 package io.element.android.features.messages.impl
 
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SheetValue
 import androidx.compose.material3.rememberBottomSheetScaffoldState
@@ -112,7 +115,7 @@ internal fun ExpandableBottomSheetScaffold(
     }
 
     SubcomposeLayout(
-        modifier = modifier,
+        modifier = modifier.windowInsetsPadding(WindowInsets.ime),
         measurePolicy = { constraints: Constraints ->
             val sheetContentSub = subcompose(Slot.SheetContent(sheetContentKey)) { sheetContent(true) }.map {
                 it.measure(Constraints(maxWidth = constraints.maxWidth))
@@ -123,7 +126,7 @@ internal fun ExpandableBottomSheetScaffold(
             val dragHandleHeight = dragHandleSub?.height?.toDp() ?: 0.dp
 
             val maxHeight = constraints.maxHeight.toDp()
-            val contentHeight = sheetContentSub.height.toDp() + dragHandleHeight
+            val contentHeight = sheetContentSub.measuredHeight.toDp() + dragHandleHeight
 
             contentOverflows = contentHeight > maxHeight
 
@@ -140,7 +143,7 @@ internal fun ExpandableBottomSheetScaffold(
                         measurePolicy = { measurables, constraints ->
                             val constraintHeight = constraints.maxHeight
                             val offset = tryOrNull { scaffoldState.bottomSheetState.requireOffset() } ?: 0f
-                            val height = Integer.max(0, constraintHeight - offset.roundToInt())
+                            val height = Integer.max(peekHeight.roundToPx(), constraintHeight - offset.roundToInt())
                             val top = measurables[0].measure(
                                 constraints.copy(
                                     minHeight = height,

gradle/libs.versions.toml

@@ -172,7 +172,7 @@ jsoup = "org.jsoup:jsoup:1.20.1"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.1.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.6.6"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.6.10"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
@@ -237,7 +237,7 @@ anvil = { id = "dev.zacsweers.anvil", version.ref = "anvil" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 ktlint = "org.jlleitschuh.gradle.ktlint:12.3.0"
 dependencygraph = "com.savvasdalkitsis.module-dependency-graph:0.12"
-dependencycheck = "org.owasp.dependencycheck:12.1.1"
+dependencycheck = "org.owasp.dependencycheck:12.1.2"
 dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" }
 paparazzi = "app.cash.paparazzi:1.3.5"
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt

@@ -27,6 +27,11 @@ fun View.showKeyboard(andRequestFocus: Boolean = false) {
     imm?.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
 }
 
+fun View.isKeyboardVisible(): Boolean {
+    val imm = context?.getSystemService<InputMethodManager>()
+    return imm?.isAcceptingText == true
+}
+
 suspend fun View.awaitWindowFocus() = suspendCancellableCoroutine { continuation ->
     if (hasWindowFocus()) {
         continuation.resume(Unit)

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParser.kt

@@ -12,6 +12,7 @@ package io.element.android.libraries.matrix.api.permalink
  * element-based domains (e.g. https://app.element.io/#/user/@chagai95:matrix.org) permalinks
  * or matrix.to permalinks (e.g. https://matrix.to/#/@chagai95:matrix.org)
  * or client permalinks (e.g. <clientPermalinkBaseUrl>user/@chagai95:matrix.org)
+ * or matrix: permalinks (e.g. matrix:u/chagai95:matrix.org)
  */
 interface PermalinkParser {
     /**

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/JoinedRoom.kt

@@ -159,7 +159,7 @@ interface JoinedRoom : BaseRoom {
     /**
      * Send an Element Call started notification if needed.
      */
-    suspend fun sendCallNotificationIfNeeded(): Result<Unit>
+    suspend fun sendCallNotificationIfNeeded(): Result<Boolean>
 
     suspend fun setSendQueueEnabled(enabled: Boolean)