Merge branch 'release/25.07.0' into main

Author: bmarty

.github/workflows/quality.yml

@@ -270,7 +270,6 @@ jobs:
       - name: Run shellcheck
         uses: ludeeus/[email protected]
         with:
-          scandir: ./tools
           severity: warning
 
   upload_reports:

.github/workflows/scripts/maestro/local-recording.sh

@@ -12,8 +12,8 @@ mkdir -p /data/local/tmp/recordings;
 FILENAME=/data/local/tmp/recordings/testRecording$COUNT.mp4
 while true
  do
-   ((COUNT++))
+   COUNT=$((COUNT+1))
    FILENAME=/data/local/tmp/recordings/testRecording$COUNT.mp4
-   echo "\nRecording video file #$COUNT"
+   printf "\nRecording video file #%d\n" $COUNT
    screenrecord --bugreport --bit-rate=16m --size 720x1280 $FILENAME
  done

.idea/kotlinc.xml

@@ -1,3 +1,45 @@
+Changes in Element X v25.06.3
+=============================
+
+## What's Changed
+### ✨ Features
+* Feature : room version upgrade by @ganfra in https://github.com/element-hq/element-x-android/pull/4862
+* Add a developer option for history sharing on invite by @richvdh in https://github.com/element-hq/element-x-android/pull/4821
+### 🙌 Improvements
+* Change : add tombstoned room decoration  by @ganfra in https://github.com/element-hq/element-x-android/pull/4891
+* Show generic notification when Event cannot be resolved by @bmarty in https://github.com/element-hq/element-x-android/pull/4889
+### 🐛 Bugfixes
+* [a11y] Improve screen reader on polls by @bmarty in https://github.com/element-hq/element-x-android/pull/4875
+* fix (event action): allow to edit only if permission to send message by @ganfra in https://github.com/element-hq/element-x-android/pull/4895
+* fix (room upgrade) : room predecessor banner on DM room by @ganfra in https://github.com/element-hq/element-x-android/pull/4896
+* fix (join room) : do not navigate up when join is successful by @ganfra in https://github.com/element-hq/element-x-android/pull/4899
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/4842
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/4881
+### Dependency upgrades
+* chore(deps): update plugin dependencycheck to v12.1.3 by @renovate in https://github.com/element-hq/element-x-android/pull/4856
+* fix(deps): update dependency org.maplibre.gl:android-sdk to v11.10.2 by @renovate in https://github.com/element-hq/element-x-android/pull/4858
+* fix(deps): update kotlin to v2.1.21-2.0.2 by @renovate in https://github.com/element-hq/element-x-android/pull/4850
+* fix(deps): update dependency app.cash.turbine:turbine to v1.2.1 by @renovate in https://github.com/element-hq/element-x-android/pull/4865
+* Update dependency com.posthog:posthog-android to v3.18.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4873
+* Update dependency org.maplibre.gl:android-sdk to v11.10.3 by @renovate in https://github.com/element-hq/element-x-android/pull/4879
+* fix(deps): update dependency com.posthog:posthog-android to v3.19.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4882
+* fix(deps): update dependency io.sentry:sentry-android to v8.13.3 by @renovate in https://github.com/element-hq/element-x-android/pull/4870
+* fix(deps): update showkase to v1.0.4 by @renovate in https://github.com/element-hq/element-x-android/pull/4878
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.6.18 by @renovate in https://github.com/element-hq/element-x-android/pull/4894
+### Others
+* Annotate Composable functions with `@ReadOnlyComposable` where it's possible by @bmarty in https://github.com/element-hq/element-x-android/pull/4859
+* Add documentation on WebViewPipController by @bmarty in https://github.com/element-hq/element-x-android/pull/4861
+* Small cleanup around log tag. by @bmarty in https://github.com/element-hq/element-x-android/pull/4860
+* Another cleanup by @bmarty in https://github.com/element-hq/element-x-android/pull/4869
+* Disable BT audio devices for Element Call on Android < 12 by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4876
+* Add a banner to ask the user to disable battery optimization when Event cannot be resolved from Push by @bmarty in https://github.com/element-hq/element-x-android/pull/4845
+* a11y: improve accessibility on rich text editor options. by @bmarty in https://github.com/element-hq/element-x-android/pull/4886
+* A11Y: improve accessibility on event reactions. by @bmarty in https://github.com/element-hq/element-x-android/pull/4877
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.06.2...v25.06.3
+
 Changes in Element X v25.06.2
 =============================
 

CHANGES.md

@@ -24,6 +24,7 @@ Learn more about why we are building Element X in our blog post: [https://elemen
 * [Translations](#translations)
 * [Rust SDK](#rust-sdk)
 * [Status](#status)
+* [Minimum SDK version](#minimum-sdk-version)
 * [Contributing](#contributing)
 * [Build instructions](#build-instructions)
 * [Support](#support)
@@ -73,6 +74,12 @@ We're doing this as a way to share code between platforms and while we've seen p
 
 This project is in an early rollout and migration phase.
 
+## Minimum SDK version
+
+Element X Android requires a minimum SDK version of 24 (Android 7.0, Nougat). We aim to support devices running Android 7.0 and above, which covers a wide range of devices still in use today.
+
+Element Android Enterprise requires a minimum SDK version of 33 (Android 13, Tiramisu). For Element Enterprise, we support only devices that still receive security updates, which means devices running Android 13 and above. Android does not have a documented support policy, but some information can be found at [https://endoflife.date/android](https://endoflife.date/android).
+
 ## Contributing
 
 Want to get actively involved in the project? You're more than welcome! A good way to start is to check the issues that are labelled with the [good first issue](https://github.com/element-hq/element-x-android/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) label. Let us know by commenting the issue that you're starting working on it.

README.md

@@ -4,6 +4,7 @@
     <locale android:name="bg"/>
     <locale android:name="cs"/>
     <locale android:name="cy"/>
+    <locale android:name="da"/>
     <locale android:name="de"/>
     <locale android:name="el"/>
     <locale android:name="en"/>

app/src/main/res/xml/locales_config.xml

@@ -41,6 +41,7 @@ import dagger.assisted.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appnav.loggedin.LoggedInNode
+import io.element.android.appnav.loggedin.MediaPreviewConfigMigration
 import io.element.android.appnav.loggedin.SendQueues
 import io.element.android.appnav.room.RoomFlowNode
 import io.element.android.appnav.room.RoomNavigationTarget
@@ -49,11 +50,11 @@ import io.element.android.features.createroom.api.CreateRoomEntryPoint
 import io.element.android.features.ftue.api.FtueEntryPoint
 import io.element.android.features.ftue.api.state.FtueService
 import io.element.android.features.ftue.api.state.FtueState
+import io.element.android.features.home.api.HomeEntryPoint
 import io.element.android.features.logout.api.LogoutEntryPoint
 import io.element.android.features.preferences.api.PreferencesEntryPoint
 import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
-import io.element.android.features.roomlist.api.RoomListEntryPoint
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
 import io.element.android.features.share.api.ShareEntryPoint
 import io.element.android.features.userprofile.api.UserProfileEntryPoint
@@ -90,6 +91,15 @@ import java.time.Duration
 import java.time.Instant
 import java.util.Optional
 import java.util.UUID
+import kotlin.collections.List
+import kotlin.collections.any
+import kotlin.collections.emptyList
+import kotlin.collections.first
+import kotlin.collections.forEach
+import kotlin.collections.listOf
+import kotlin.collections.mapNotNull
+import kotlin.collections.plus
+import kotlin.collections.setOf
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toKotlinDuration
@@ -98,7 +108,7 @@ import kotlin.time.toKotlinDuration
 class LoggedInFlowNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    private val roomListEntryPoint: RoomListEntryPoint,
+    private val homeEntryPoint: HomeEntryPoint,
     private val preferencesEntryPoint: PreferencesEntryPoint,
     private val createRoomEntryPoint: CreateRoomEntryPoint,
     private val appNavigationStateService: AppNavigationStateService,
@@ -114,6 +124,7 @@ class LoggedInFlowNode @AssistedInject constructor(
     private val sendingQueue: SendQueues,
     private val logoutEntryPoint: LogoutEntryPoint,
     private val incomingVerificationEntryPoint: IncomingVerificationEntryPoint,
+    private val mediaPreviewConfigMigration: MediaPreviewConfigMigration,
     snackbarDispatcher: SnackbarDispatcher,
 ) : BaseFlowNode<LoggedInFlowNode.NavTarget>(
     backstack = BackStack(
@@ -160,7 +171,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                 // Otherwise, the RoomList UI may be incorrectly displayed on top
                 withTimeout(5.seconds) {
                     backstack.elements.first { elements ->
-                        elements.any { it.key.navTarget == NavTarget.RoomList }
+                        elements.any { it.key.navTarget == NavTarget.Home }
                     }
                 }
 
@@ -179,13 +190,14 @@ class LoggedInFlowNode @AssistedInject constructor(
                 appNavigationStateService.onNavigateToSpace(id, MAIN_SPACE)
                 loggedInFlowProcessor.observeEvents(sessionCoroutineScope)
                 matrixClient.sessionVerificationService().setListener(verificationListener)
+                mediaPreviewConfigMigration()
 
                 ftueService.state
                     .onEach { ftueState ->
                         when (ftueState) {
                             is FtueState.Unknown -> Unit // Nothing to do
                             is FtueState.Incomplete -> backstack.safeRoot(NavTarget.Ftue)
-                            is FtueState.Complete -> backstack.safeRoot(NavTarget.RoomList)
+                            is FtueState.Complete -> backstack.safeRoot(NavTarget.Home)
                         }
                     }
                     .launchIn(lifecycleScope)
@@ -212,7 +224,7 @@ class LoggedInFlowNode @AssistedInject constructor(
         data object LoggedInPermanent : NavTarget
 
         @Parcelize
-        data object RoomList : NavTarget
+        data object Home : NavTarget
 
         @Parcelize
         data class Room(
@@ -269,8 +281,8 @@ class LoggedInFlowNode @AssistedInject constructor(
                 }
                 createNode<LoggedInNode>(buildContext, listOf(callback))
             }
-            NavTarget.RoomList -> {
-                val callback = object : RoomListEntryPoint.Callback {
+            NavTarget.Home -> {
+                val callback = object : HomeEntryPoint.Callback {
                     override fun onRoomClick(roomId: RoomId) {
                         backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
                     }
@@ -303,7 +315,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                         backstack.push(NavTarget.LogoutForNativeSlidingSyncMigrationNeeded)
                     }
                 }
-                roomListEntryPoint
+                homeEntryPoint
                     .nodeBuilder(this, buildContext)
                     .callback(callback)
                     .build()
@@ -487,7 +499,7 @@ class LoggedInFlowNode @AssistedInject constructor(
         clearBackstack: Boolean,
     ) {
         waitForNavTargetAttached { navTarget ->
-            navTarget is NavTarget.RoomList
+            navTarget is NavTarget.Home
         }
         attachChild<RoomFlowNode> {
             val roomNavTarget = NavTarget.Room(
@@ -504,7 +516,7 @@ class LoggedInFlowNode @AssistedInject constructor(
 
     suspend fun attachUser(userId: UserId) {
         waitForNavTargetAttached { navTarget ->
-            navTarget is NavTarget.RoomList
+            navTarget is NavTarget.Home
         }
         attachChild<Node> {
             backstack.push(
@@ -517,7 +529,7 @@ class LoggedInFlowNode @AssistedInject constructor(
 
     internal suspend fun attachIncomingShare(intent: Intent) {
         waitForNavTargetAttached { navTarget ->
-            navTarget is NavTarget.RoomList
+            navTarget is NavTarget.Home
         }
         attachChild<Node> {
             backstack.push(
@@ -555,7 +567,7 @@ private class AttachRoomOperation(
         return if (clearBackstack) {
             // Makes sure the room list target is alone in the backstack and stashed
             elements.mapNotNull { element ->
-                if (element.key.navTarget == LoggedInFlowNode.NavTarget.RoomList) {
+                if (element.key.navTarget == LoggedInFlowNode.NavTarget.Home) {
                     element.transitionTo(STASHED, this)
                 } else {
                     null

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.appnav.loggedin
+
+import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.matrix.api.media.MediaPreviewService
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * This migration is temporary, will be safe to remove after some time.
+ * The goal is to set the server config if it's not set, and remove the local data.
+ */
+class MediaPreviewConfigMigration @Inject constructor(
+    private val mediaPreviewService: MediaPreviewService,
+    private val appPreferencesStore: AppPreferencesStore,
+    @SessionCoroutineScope
+    private val sessionCoroutineScope: CoroutineScope,
+) {
+    @Suppress("DEPRECATION")
+    operator fun invoke() = sessionCoroutineScope.launch {
+        val hideInviteAvatars = appPreferencesStore.getHideInviteAvatarsFlow().first()
+        val mediaPreviewValue = appPreferencesStore.getTimelineMediaPreviewValueFlow().first()
+        if (hideInviteAvatars == null && mediaPreviewValue == null) {
+            // No local data, abort.
+            return@launch
+        }
+        mediaPreviewService
+            .fetchMediaPreviewConfig()
+            .onSuccess { config ->
+                if (config != null) {
+                    appPreferencesStore.setHideInviteAvatars(null)
+                    appPreferencesStore.setTimelineMediaPreviewValue(null)
+                } else {
+                    if (hideInviteAvatars != null) {
+                        mediaPreviewService.setHideInviteAvatars(hideInviteAvatars)
+                        appPreferencesStore.setHideInviteAvatars(null)
+                    }
+                    if (mediaPreviewValue != null) {
+                        mediaPreviewService.setMediaPreviewValue(mediaPreviewValue)
+                        appPreferencesStore.setTimelineMediaPreviewValue(null)
+                    }
+                }
+            }
+            .onFailure {
+                Timber.e(it, "Couldn't perform migration, failed to fetch media preview config.")
+            }
+    }
+}

appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt

@@ -0,0 +1,6 @@
+<?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">"Log ud og opgradér"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s understøtter ikke længere den gamle protokol. Log ud og log ind igen for at fortsætte med at bruge appen."</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Din hjemmeserver understøtter ikke længere den gamle protokol. Log ud og log ind igen for at fortsætte med at bruge appen."</string>
+</resources>

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

@@ -1,5 +1,6 @@
 <?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">"Keluar &amp; Tingkatkan"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s tidak lagi mendukung protokol lama. Silakan keluar dan masuk kembali untuk terus menggunakan aplikasi."</string>
   <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Homeserver Anda tidak lagi mendukung protokol lama. Silakan keluar dan masuk kembali untuk terus menggunakan aplikasi."</string>
 </resources>