-
Notifications
You must be signed in to change notification settings - Fork 187
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3132 from element-hq/feature/fga/draft_in_memory_…
…when_editing Draft : add volatile storage when moving to edit mode.
- Loading branch information
Showing
10 changed files
with
436 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
...mpl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftStore.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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?) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
...c/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| /** | ||
| * A draft store that persists drafts in the room state. | ||
| * It can be used to store drafts that should be persisted across app restarts. | ||
| */ | ||
| 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") | ||
| } | ||
| } | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
...main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| /** | ||
| * A volatile draft store that keeps drafts in memory only. | ||
| * It can be used to store drafts that should not be persisted across app restarts. | ||
| * Currently it's used to store draft message when moving to edit mode. | ||
| */ | ||
| class VolatileComposerDraftStore @Inject constructor() : ComposerDraftStore { | ||
| private val drafts: MutableMap<RoomId, ComposerDraft> = 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 | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.