mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Merge branch 'develop' into feature/fga/fix_restoration
This commit is contained in:
+1
-1
@@ -19,8 +19,8 @@ package io.element.android.libraries.matrix.permalink
|
||||
import android.net.Uri
|
||||
import android.net.UrlQuerySanitizer
|
||||
import io.element.android.libraries.matrix.core.MatrixPatterns
|
||||
import java.net.URLDecoder
|
||||
import timber.log.Timber
|
||||
import java.net.URLDecoder
|
||||
|
||||
/**
|
||||
* This class turns a uri to a [PermalinkData].
|
||||
|
||||
+3
-3
@@ -19,9 +19,6 @@ package io.element.android.libraries.matrix.room
|
||||
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
|
||||
import io.element.android.libraries.matrix.sync.roomListDiff
|
||||
import io.element.android.libraries.matrix.sync.state
|
||||
import java.io.Closeable
|
||||
import java.util.Collections
|
||||
import java.util.UUID
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.FlowPreview
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
@@ -42,6 +39,9 @@ import org.matrix.rustcomponents.sdk.SlidingSyncView
|
||||
import org.matrix.rustcomponents.sdk.SlidingSyncViewRoomsListDiff
|
||||
import org.matrix.rustcomponents.sdk.UpdateSummary
|
||||
import timber.log.Timber
|
||||
import java.io.Closeable
|
||||
import java.util.Collections
|
||||
import java.util.UUID
|
||||
|
||||
interface RoomSummaryDataSource {
|
||||
fun roomSummaries(): StateFlow<List<RoomSummary>>
|
||||
|
||||
Reference in New Issue
Block a user