Merge pull request #4855 from element-hq/feature/fga/deps_rust_sdk_25.06.10

deps (matrix rust sdk) : bump version to 25.06.10

Author: ganfra

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 {

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" }

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)
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt

@@ -161,14 +161,16 @@ class JoinedRustRoom(
                 maxEventsToLoad = 100u,
                 maxConcurrentRequests = 10u,
             )
-            is CreateTimelineParams.MediaOnly -> TimelineFocus.Live
+            is CreateTimelineParams.MediaOnly -> TimelineFocus.Live(hideThreadedEvents = false)
             is CreateTimelineParams.Focused -> TimelineFocus.Event(
                 eventId = createTimelineParams.focusedEventId.value,
                 numContextEvents = 50u,
+                hideThreadedEvents = false,
             )
             is CreateTimelineParams.MediaOnlyFocused -> TimelineFocus.Event(
                 eventId = createTimelineParams.focusedEventId.value,
                 numContextEvents = 50u,
+                hideThreadedEvents = false,
             )
         }
 
@@ -427,7 +429,7 @@ class JoinedRustRoom(
         }
     }
 
-    override suspend fun sendCallNotificationIfNeeded(): Result<Unit> = withContext(roomDispatcher) {
+    override suspend fun sendCallNotificationIfNeeded(): Result<Boolean> = withContext(roomDispatcher) {
         runCatchingExceptions {
             innerRoom.sendCallNotificationIfNeeded()
         }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt

@@ -110,7 +110,7 @@ class RustRoomFactory(
                 // Init the live timeline in the SDK from the Room
                 val timeline = sdkRoom.timelineWithConfiguration(
                     TimelineConfiguration(
-                        focus = TimelineFocus.Live,
+                        focus = TimelineFocus.Live(hideThreadedEvents = false),
                         filter = eventFilters?.let(TimelineFilter::EventTypeFilter) ?: TimelineFilter.All,
                         internalIdPrefix = "live",
                         dateDividerMode = DateDividerMode.DAILY,

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeJoinedRoom.kt

@@ -55,7 +55,7 @@ class FakeJoinedRoom(
     private val roomNotificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
     private var createTimelineResult: (CreateTimelineParams) -> Result<Timeline> = { lambdaError() },
     private val editMessageLambda: (EventId, String, String?, List<IntentionalMention>) -> Result<Unit> = { _, _, _, _ -> lambdaError() },
-    private val sendCallNotificationIfNeededResult: () -> Result<Unit> = { lambdaError() },
+    private val sendCallNotificationIfNeededResult: () -> Result<Boolean> = { lambdaError() },
     private val progressCallbackValues: List<Pair<Long, Long>> = emptyList(),
     private val generateWidgetWebViewUrlResult: (MatrixWidgetSettings, String, String?, String?) -> Result<String> = { _, _, _, _ -> lambdaError() },
     private val getWidgetDriverResult: (MatrixWidgetSettings) -> Result<MatrixWidgetDriver> = { lambdaError() },
@@ -207,7 +207,7 @@ class FakeJoinedRoom(
         return getWidgetDriverResult(widgetSettings)
     }
 
-    override suspend fun sendCallNotificationIfNeeded(): Result<Unit> = simulateLongTask {
+    override suspend fun sendCallNotificationIfNeeded(): Result<Boolean> = simulateLongTask {
         sendCallNotificationIfNeededResult()
     }