From afd13ab22fbde01701c8c87d01a9a49d6b579ddf Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 2 Jul 2024 17:19:45 +0200 Subject: [PATCH] Draft : introduce VolatileComposerDraftStore --- .../messages/impl/draft/ComposerDraftStore.kt | 25 ++++++++ .../impl/draft/MatrixComposerDraftStore.kt | 59 +++++++++++++++++++ .../impl/draft/VolatileComposerDraftStore.kt | 39 ++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftStore.kt create mode 100644 features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt create mode 100644 features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftStore.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftStore.kt new file mode 100644 index 0000000000..ab36e99a42 --- /dev/null +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftStore.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2024 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.impl.draft + +import io.element.android.libraries.matrix.api.core.RoomId +import io.element.android.libraries.matrix.api.room.draft.ComposerDraft + +interface ComposerDraftStore { + suspend fun loadDraft(roomId: RoomId): ComposerDraft? + suspend fun updateDraft(roomId: RoomId, draft: ComposerDraft?) +} diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt new file mode 100644 index 0000000000..a5ed0095a3 --- /dev/null +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2024 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.impl.draft + +import io.element.android.libraries.matrix.api.MatrixClient +import io.element.android.libraries.matrix.api.core.RoomId +import io.element.android.libraries.matrix.api.room.draft.ComposerDraft +import timber.log.Timber +import javax.inject.Inject + +class MatrixComposerDraftStore @Inject constructor( + private val client: MatrixClient, +) : ComposerDraftStore { + + override suspend fun loadDraft(roomId: RoomId): ComposerDraft? { + return client.getRoom(roomId)?.use { room -> + room.loadComposerDraft() + .onFailure { + Timber.e(it, "Failed to load composer draft for room $roomId") + } + .onSuccess { draft -> + room.clearComposerDraft() + Timber.d("Loaded composer draft for room $roomId : $draft") + } + .getOrNull() + } + } + + override suspend fun updateDraft(roomId: RoomId, draft: ComposerDraft?) { + client.getRoom(roomId)?.use { room -> + val updateDraftResult = if (draft == null) { + room.clearComposerDraft() + } else { + room.saveComposerDraft(draft) + } + updateDraftResult + .onFailure { + Timber.e(it, "Failed to update composer draft for room $roomId") + } + .onSuccess { + Timber.d("Updated composer draft for room $roomId") + } + } + } +} diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt new file mode 100644 index 0000000000..5a0811b6b2 --- /dev/null +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2024 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.messages.impl.draft + +import io.element.android.libraries.matrix.api.core.RoomId +import io.element.android.libraries.matrix.api.room.draft.ComposerDraft +import javax.inject.Inject + +class VolatileComposerDraftStore @Inject constructor() : ComposerDraftStore { + + private val drafts: MutableMap = mutableMapOf() + + override suspend fun loadDraft(roomId: RoomId): ComposerDraft? { + // Remove the draft from the map when it is loaded + return drafts.remove(roomId) + } + + override suspend fun updateDraft(roomId: RoomId, draft: ComposerDraft?) { + if (draft == null) { + drafts.remove(roomId) + } else { + drafts[roomId] = draft + } + } +}