Skip to content
Snippets Groups Projects
Commit 51ea4de4 authored by Taras's avatar Taras
Browse files

Use get joined galleries for media backup

parent 97e02dea
No related branches found
No related tags found
No related merge requests found
...@@ -9,12 +9,12 @@ import org.futo.circles.core.feature.timeline.post.SendMessageDataSource ...@@ -9,12 +9,12 @@ import org.futo.circles.core.feature.timeline.post.SendMessageDataSource
import org.futo.circles.core.model.Gallery import org.futo.circles.core.model.Gallery
import org.futo.circles.core.model.MediaType import org.futo.circles.core.model.MediaType
import org.futo.circles.core.provider.MatrixSessionProvider import org.futo.circles.core.provider.MatrixSessionProvider
import org.futo.circles.core.utils.getGalleries
import org.futo.circles.gallery.model.MediaFolderListItem import org.futo.circles.gallery.model.MediaFolderListItem
import org.futo.circles.gallery.model.MediaToBackupItem import org.futo.circles.gallery.model.MediaToBackupItem
import org.futo.circles.gallery.model.toMediaToBackupItem import org.futo.circles.gallery.model.toMediaToBackupItem
import org.matrix.android.sdk.api.session.getRoom import org.matrix.android.sdk.api.session.getRoom
import org.matrix.android.sdk.api.session.room.model.Membership import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
import java.io.File import java.io.File
import javax.inject.Inject import javax.inject.Inject
...@@ -79,7 +79,7 @@ class MediaBackupDataSource @Inject constructor( ...@@ -79,7 +79,7 @@ class MediaBackupDataSource @Inject constructor(
} }
private suspend fun createGalleryIfNotExist(bucketId: String): String { private suspend fun createGalleryIfNotExist(bucketId: String): String {
var roomId = getJoinedRoomIdByTag(bucketId) var roomId = getJoinedGalleryIdByTag(bucketId)
if (roomId == null) { if (roomId == null) {
roomId = createRoomDataSource.createRoom( roomId = createRoomDataSource.createRoom(
circlesRoom = Gallery(), circlesRoom = Gallery(),
...@@ -91,12 +91,10 @@ class MediaBackupDataSource @Inject constructor( ...@@ -91,12 +91,10 @@ class MediaBackupDataSource @Inject constructor(
return roomId return roomId
} }
private fun getJoinedRoomIdByTag(tag: String): String? { private fun getJoinedGalleryIdByTag(tag: String): String? =
val session = MatrixSessionProvider.currentSession ?: return null getGalleries(membershipFilter = listOf(Membership.JOIN))
return session.roomService().getRoomSummaries(roomSummaryQueryParams { .firstOrNull { it.hasTag(tag) }?.roomId
memberships = listOf(Membership.JOIN)
}).firstOrNull { it.hasTag(tag) }?.roomId
}
private fun getMediaCursor( private fun getMediaCursor(
selection: String? = null selection: String? = null
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment